progman.exe^H^H^H^H
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Rename bordercolor -> border_bgcolor, framecolor -> border_fgcolor

Also rename the internal variables to make it a bit easier to
follow.

+72 -54
+37 -30
client.c
··· 51 51 { 52 52 client_t *c; 53 53 XWindowAttributes attr; 54 - XColor exact; 55 54 long supplied; 56 55 57 56 c = malloc(sizeof *c); ··· 87 86 c->geom.h = attr.height; 88 87 c->cmap = attr.colormap; 89 88 c->old_bw = attr.border_width; 90 - 91 - XAllocNamedColor(dpy, c->cmap, opt_fg, &fg, &exact); 92 - XAllocNamedColor(dpy, c->cmap, opt_bg, &bg, &exact); 93 - XAllocNamedColor(dpy, c->cmap, opt_unfocused_fg, &unfocused_fg, &exact); 94 - XAllocNamedColor(dpy, c->cmap, opt_unfocused_bg, &unfocused_bg, &exact); 95 - XAllocNamedColor(dpy, c->cmap, opt_bd, &bd, &exact); 96 89 97 90 if (get_atoms(c->win, net_wm_desk, XA_CARDINAL, 0, &c->desk, 1, NULL)) { 98 91 if (c->desk == -1) ··· 429 422 recalc_frame(c); 430 423 431 424 pattr.override_redirect = True; 432 - pattr.background_pixel = bd.pixel; 425 + pattr.background_pixel = border_bg.pixel; 433 426 pattr.event_mask = SubMask | ButtonPressMask | ButtonReleaseMask | 434 427 ExposureMask | EnterWindowMask; 435 428 c->frame = XCreateWindow(dpy, root, ··· 785 778 c->geom.y - c->frame_geom.y, 786 779 c->geom.w, c->geom.h); 787 780 788 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 781 + XSetForeground(dpy, DefaultGC(dpy, screen), border_fg.pixel); 789 782 XDrawRectangle(dpy, c->frame, DefaultGC(dpy, screen), 790 783 0, 0, c->frame_geom.w - 1, c->frame_geom.h - 1); 791 784 } ··· 858 851 only == c->iconify || only == c->zoom) && 859 852 (c->frame_style & FRAME_TITLEBAR)) { 860 853 /* separators between titlebar and buttons */ 861 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 854 + XSetForeground(dpy, DefaultGC(dpy, screen), border_fg.pixel); 862 855 XDrawRectangle(dpy, c->titlebar, DefaultGC(dpy, screen), 863 856 0, -1, c->titlebar_geom.w - 1, c->titlebar_geom.h + 1); 864 857 ··· 901 894 902 895 if (only == None || only == c->zoom || only == c->iconify) { 903 896 if (c->frame_style & (FRAME_ZOOM | FRAME_ICONIFY)) { 904 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 897 + XSetForeground(dpy, DefaultGC(dpy, screen), 898 + border_fg.pixel); 905 899 XDrawLine(dpy, c->frame, DefaultGC(dpy, screen), 906 900 c->iconify_geom.x + c->iconify_geom.w, 907 901 c->resize_n_geom.h, ··· 957 951 958 952 if (only == None || only == c->resize_nw) { 959 953 if (c->frame_style & FRAME_RESIZABLE) { 960 - XSetWindowBackground(dpy, c->resize_nw, bd.pixel); 954 + XSetWindowBackground(dpy, c->resize_nw, 955 + border_bg.pixel); 961 956 XClearWindow(dpy, c->resize_nw); 962 957 XMoveResizeWindow(dpy, c->resize_nw, 963 958 c->resize_nw_geom.x, c->resize_nw_geom.y, 964 959 c->resize_nw_geom.w, c->resize_nw_geom.h); 965 960 XMapWindow(dpy, c->resize_nw); 966 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 961 + XSetForeground(dpy, DefaultGC(dpy, screen), 962 + border_fg.pixel); 967 963 XDrawRectangle(dpy, c->resize_nw, DefaultGC(dpy, 968 964 screen), 0, 0, c->resize_nw_geom.w, 969 965 c->resize_nw_geom.h); ··· 981 977 982 978 if (only == None || only == c->resize_n) { 983 979 if (c->frame_style & FRAME_RESIZABLE) { 984 - XSetWindowBackground(dpy, c->resize_n, bd.pixel); 980 + XSetWindowBackground(dpy, c->resize_n, border_bg.pixel); 985 981 XClearWindow(dpy, c->resize_n); 986 982 XMoveResizeWindow(dpy, c->resize_n, 987 983 c->resize_n_geom.x, c->resize_n_geom.y, 988 984 c->resize_n_geom.w, c->resize_n_geom.h); 989 985 XMapWindow(dpy, c->resize_n); 990 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 986 + XSetForeground(dpy, DefaultGC(dpy, screen), 987 + border_fg.pixel); 991 988 XDrawRectangle(dpy, c->resize_n, DefaultGC(dpy, screen), 992 989 0, 0, c->resize_n_geom.w - 1, 993 990 c->resize_n_geom.h - 1); ··· 997 994 998 995 if (only == None || only == c->resize_ne) { 999 996 if (c->frame_style & FRAME_RESIZABLE) { 1000 - XSetWindowBackground(dpy, c->resize_ne, bd.pixel); 997 + XSetWindowBackground(dpy, c->resize_ne, 998 + border_bg.pixel); 1001 999 XMapWindow(dpy, c->resize_ne); 1002 1000 XClearWindow(dpy, c->resize_ne); 1003 1001 XMoveResizeWindow(dpy, c->resize_ne, 1004 1002 c->resize_ne_geom.x, c->resize_ne_geom.y, 1005 1003 c->resize_ne_geom.w, c->resize_ne_geom.h); 1006 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 1004 + XSetForeground(dpy, DefaultGC(dpy, screen), 1005 + border_fg.pixel); 1007 1006 XDrawRectangle(dpy, c->resize_ne, 1008 1007 DefaultGC(dpy, screen), -1, 0, c->resize_ne_geom.w, 1009 1008 c->resize_ne_geom.h); ··· 1020 1019 if (only == None || only == c->resize_e) { 1021 1020 if ((c->frame_style & FRAME_RESIZABLE) && 1022 1021 !(c->state & STATE_SHADED)) { 1023 - XSetWindowBackground(dpy, c->resize_e, bd.pixel); 1022 + XSetWindowBackground(dpy, c->resize_e, border_bg.pixel); 1024 1023 XMapWindow(dpy, c->resize_e); 1025 1024 XClearWindow(dpy, c->resize_e); 1026 1025 XMoveResizeWindow(dpy, c->resize_e, 1027 1026 c->resize_e_geom.x, c->resize_e_geom.y, 1028 1027 c->resize_e_geom.w, c->resize_e_geom.h); 1029 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 1028 + XSetForeground(dpy, DefaultGC(dpy, screen), 1029 + border_fg.pixel); 1030 1030 XDrawRectangle(dpy, c->resize_e, DefaultGC(dpy, screen), 1031 1031 0, -1, c->resize_e_geom.w - 1, 1032 1032 c->resize_e_geom.h + 1); ··· 1037 1037 if (only == None || only == c->resize_se) { 1038 1038 if ((c->frame_style & FRAME_RESIZABLE) && 1039 1039 !(c->state & STATE_SHADED)) { 1040 - XSetWindowBackground(dpy, c->resize_se, bd.pixel); 1040 + XSetWindowBackground(dpy, c->resize_se, 1041 + border_bg.pixel); 1041 1042 XClearWindow(dpy, c->resize_se); 1042 1043 XMoveResizeWindow(dpy, c->resize_se, 1043 1044 c->resize_se_geom.x, c->resize_se_geom.y, 1044 1045 c->resize_se_geom.w, c->resize_se_geom.h); 1045 1046 XMapWindow(dpy, c->resize_se); 1046 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 1047 + XSetForeground(dpy, DefaultGC(dpy, screen), 1048 + border_fg.pixel); 1047 1049 XDrawRectangle(dpy, c->resize_se, 1048 1050 DefaultGC(dpy, screen), 0, 0, 1049 1051 c->resize_se_geom.w - 1, ··· 1064 1066 1065 1067 if (only == None || only == c->resize_s) { 1066 1068 if (c->frame_style & FRAME_RESIZABLE) { 1067 - XSetWindowBackground(dpy, c->resize_s, bd.pixel); 1069 + XSetWindowBackground(dpy, c->resize_s, border_bg.pixel); 1068 1070 XClearWindow(dpy, c->resize_s); 1069 1071 XMoveResizeWindow(dpy, c->resize_s, 1070 1072 c->resize_s_geom.x, c->resize_s_geom.y, 1071 1073 c->resize_s_geom.w, c->resize_s_geom.h); 1072 1074 XMapWindow(dpy, c->resize_s); 1073 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 1075 + XSetForeground(dpy, DefaultGC(dpy, screen), 1076 + border_fg.pixel); 1074 1077 XDrawRectangle(dpy, c->resize_s, DefaultGC(dpy, screen), 1075 1078 0, 0, c->resize_s_geom.w, 1076 1079 c->resize_s_geom.h - 1); 1077 1080 1078 1081 if (c->state & STATE_SHADED) { 1079 1082 XSetForeground(dpy, DefaultGC(dpy, screen), 1080 - bd.pixel); 1083 + border_bg.pixel); 1081 1084 XDrawLine(dpy, c->resize_s, 1082 1085 DefaultGC(dpy, screen), 1, 0, 1083 1086 c->resize_s_geom.h - 1, 0); ··· 1087 1090 0, c->resize_s_geom.w - 1, 0); 1088 1091 1089 1092 XSetForeground(dpy, DefaultGC(dpy, screen), 1090 - bdf.pixel); 1093 + border_fg.pixel); 1091 1094 XDrawLine(dpy, c->resize_s, 1092 1095 DefaultGC(dpy, screen), 1093 1096 c->resize_sw_geom.w, 0, ··· 1106 1109 if (only == None || only == c->resize_sw) { 1107 1110 if ((c->frame_style & FRAME_RESIZABLE) && 1108 1111 !(c->state & STATE_SHADED)) { 1109 - XSetWindowBackground(dpy, c->resize_sw, bd.pixel); 1112 + XSetWindowBackground(dpy, c->resize_sw, 1113 + border_bg.pixel); 1110 1114 XClearWindow(dpy, c->resize_sw); 1111 1115 XMoveResizeWindow(dpy, c->resize_sw, 1112 1116 c->resize_sw_geom.x, c->resize_sw_geom.y, 1113 1117 c->resize_sw_geom.w, c->resize_sw_geom.h); 1114 1118 XMapWindow(dpy, c->resize_sw); 1115 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 1119 + XSetForeground(dpy, DefaultGC(dpy, screen), 1120 + border_fg.pixel); 1116 1121 XDrawRectangle(dpy, c->resize_sw, 1117 1122 DefaultGC(dpy, screen), 0, 0, c->resize_sw_geom.w, 1118 1123 c->resize_sw_geom.h - 1); 1119 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 1124 + XSetForeground(dpy, DefaultGC(dpy, screen), 1125 + border_fg.pixel); 1120 1126 XFillRectangle(dpy, c->resize_sw, 1121 1127 DefaultGC(dpy, screen), c->resize_w_geom.w - 1, 0, 1122 1128 c->resize_sw_geom.w - c->resize_w_geom.w + 1, ··· 1134 1140 if (only == None || only == c->resize_w) { 1135 1141 if ((c->frame_style & FRAME_RESIZABLE) && 1136 1142 !(c->state & STATE_SHADED)) { 1137 - XSetWindowBackground(dpy, c->resize_w, bd.pixel); 1143 + XSetWindowBackground(dpy, c->resize_w, border_bg.pixel); 1138 1144 XClearWindow(dpy, c->resize_w); 1139 1145 XMoveResizeWindow(dpy, c->resize_w, 1140 1146 c->resize_w_geom.x, c->resize_w_geom.y, 1141 1147 c->resize_w_geom.w, c->resize_w_geom.h); 1142 1148 XMapWindow(dpy, c->resize_w); 1143 - XSetForeground(dpy, DefaultGC(dpy, screen), bdf.pixel); 1149 + XSetForeground(dpy, DefaultGC(dpy, screen), 1150 + border_fg.pixel); 1144 1151 XDrawRectangle(dpy, c->resize_w, DefaultGC(dpy, screen), 1145 1152 0, -1, c->resize_w_geom.w - 1, 1146 1153 c->resize_w_geom.h + 1);
+12 -12
progman.c
··· 80 80 XColor button_bg; 81 81 XColor bevel_dark; 82 82 XColor bevel_light; 83 - XColor bd; 84 - XColor bdf; 83 + XColor border_fg; 84 + XColor border_bg; 85 85 GC pixmap_gc; 86 86 GC invert_gc; 87 87 Pixmap close_pm; ··· 121 121 char *opt_button_bg = DEF_BUTTON_BG; 122 122 char *opt_bevel_dark = DEF_BEVEL_DARK; 123 123 char *opt_bevel_light = DEF_BEVEL_LIGHT; 124 - char *opt_bd = DEF_BD; 125 - char *opt_bdf = DEF_BDF; 124 + char *opt_border_bg = DEF_BORDER_BG; 125 + char *opt_border_fg = DEF_BORDER_FG; 126 126 char *opt_root_bg = DEF_ROOTBG; 127 127 int opt_bw = DEF_BW; 128 128 int opt_pad = DEF_PAD; ··· 202 202 opt_unfocused_bg = strdup(val); 203 203 else if (strcmp(key, "button_bgcolor") == 0) 204 204 opt_button_bg = strdup(val); 205 - else if (strcmp(key, "bordercolor") == 0) 206 - opt_bd = strdup(val); 207 - else if (strcmp(key, "framecolor") == 0) 208 - opt_bdf = strdup(val); 209 - else if (strcmp(key, "bdwidth") == 0) 205 + else if (strcmp(key, "border_fgcolor") == 0) 206 + opt_border_fg = strdup(val); 207 + else if (strcmp(key, "border_bgcolor") == 0) 208 + opt_border_bg = strdup(val); 209 + else if (strcmp(key, "border_width") == 0) 210 210 opt_bw = atoi(val); 211 - else if (strcmp(key, "padding") == 0) 211 + else if (strcmp(key, "title_padding") == 0) 212 212 opt_pad = atoi(val); 213 213 else if (strcmp(key, "edgeresist") == 0) 214 214 opt_edge_resist = atoi(val); ··· 278 278 XAllocNamedColor(dpy, def_cmap, opt_button_bg, &button_bg, &exact); 279 279 XAllocNamedColor(dpy, def_cmap, opt_bevel_dark, &bevel_dark, &exact); 280 280 XAllocNamedColor(dpy, def_cmap, opt_bevel_light, &bevel_light, &exact); 281 - XAllocNamedColor(dpy, def_cmap, opt_bd, &bd, &exact); 282 - XAllocNamedColor(dpy, def_cmap, opt_bdf, &bdf, &exact); 281 + XAllocNamedColor(dpy, def_cmap, opt_border_fg, &border_fg, &exact); 282 + XAllocNamedColor(dpy, def_cmap, opt_border_bg, &border_bg, &exact); 283 283 284 284 XSetLineAttributes(dpy, DefaultGC(dpy, screen), 1, LineSolid, CapButt, 285 285 JoinBevel);
+6 -6
progman.h
··· 43 43 #define DEF_BEVEL_LIGHT "white" 44 44 45 45 /* Borders */ 46 - #define DEF_BD "#c0c7c8" 47 - #define DEF_BDF "black" 46 + #define DEF_BORDER_BG "#c0c7c8" 47 + #define DEF_BORDER_FG "black" 48 48 49 49 /* Default root color is unchanged */ 50 50 #define DEF_ROOTBG NULL ··· 247 247 extern XColor button_bg; 248 248 extern XColor bevel_dark; 249 249 extern XColor bevel_light; 250 - extern XColor bd; 251 - extern XColor bdf; 250 + extern XColor border_fg; 251 + extern XColor border_bg; 252 252 extern GC pixmap_gc; 253 253 extern GC invert_gc; 254 254 extern Pixmap close_pm; ··· 285 285 extern char *opt_button_bg; 286 286 extern char *opt_bevel_dark; 287 287 extern char *opt_bevel_light; 288 - extern char *opt_bd; 289 - extern char *opt_bdf; 288 + extern char *opt_border_fg; 289 + extern char *opt_border_bg; 290 290 extern char *opt_root_bg; 291 291 extern int opt_bevel; 292 292 extern int opt_bw;
+15 -4
progman.ini
··· 8 8 [progman] 9 9 font = Microsoft Sans Serif:bold:size=14 10 10 iconfont = Microsoft Sans Serif:size=11 11 + 12 + # Focused windows 11 13 fgcolor = white 12 14 bgcolor = #0000a8 15 + title_padding = 6 16 + 17 + # Unfocused windows 13 18 unfocused_fgcolor = black 14 19 unfocused_bgcolor = white 20 + 21 + # Borders 22 + border_bgcolor = #c0c7c8 23 + border_fgcolor = black 24 + border_width = 6 15 25 button_bgcolor = #c0c7c8 16 - bordercolor = #c0c7c8 17 - framecolor = black 26 + 18 27 # When not specified, the root color is not changed 19 28 #root_bgcolor = #c0c7c8 20 - bdwidth = 6 21 - padding = 6 29 + 22 30 # When moving windows, how hard to resist going off-screen 23 31 edgeresist = 80 24 32 33 + # What to launch when right-clicking the root 25 34 launcher = aemenu 35 + 36 + # What to launch when pressing the Win/Super key 26 37 terminal = xterm 27 38 28 39 [launcher]
+2 -2
themes/hotdogstand.ini
··· 4 4 bgcolor = black 5 5 unfocused_fgcolor = white 6 6 unfocused_bgcolor = red 7 - bordercolor = red 8 - framecolor = black 7 + border_bgcolor = red 8 + border_fgcolor = black 9 9 root_bgcolor = yellow