… | |
… | |
35 | |
35 | |
36 | #ifdef KEYSYM_RESOURCE |
36 | #ifdef KEYSYM_RESOURCE |
37 | #include "keyboard.h" |
37 | #include "keyboard.h" |
38 | #endif |
38 | #endif |
39 | |
39 | |
|
|
40 | /* place holders used for parsing command-line options */ |
|
|
41 | #define Optflag_Reverse 0x40000000UL |
|
|
42 | #define Optflag_Boolean 0x80000000UL |
|
|
43 | #define Optflag_mask 0x3fffffffUL |
|
|
44 | |
40 | /* #define DEBUG_RESOURCES */ |
45 | /* #define DEBUG_RESOURCES */ |
41 | |
46 | |
42 | /*{{{ monolithic option/resource structure: */ |
47 | /*{{{ monolithic option/resource structure: */ |
43 | /* |
48 | /* |
44 | * `string' options MUST have a usage argument |
49 | * `string' options MUST have a usage argument |
… | |
… | |
58 | #define RSTRG(rsp, kw, arg) \ |
63 | #define RSTRG(rsp, kw, arg) \ |
59 | {0, (rsp), (kw), NULL, (arg), NULL} |
64 | {0, (rsp), (kw), NULL, (arg), NULL} |
60 | |
65 | |
61 | /* BOOL () - regular boolean `-/+' flag */ |
66 | /* BOOL () - regular boolean `-/+' flag */ |
62 | #define BOOL(rsp, kw, opt, flag, desc) \ |
67 | #define BOOL(rsp, kw, opt, flag, desc) \ |
63 | { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} |
68 | { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
64 | |
69 | |
65 | /* SWCH () - `-' flag */ |
70 | /* SWCH () - `-' flag */ |
66 | #define SWCH(opt, flag, desc) \ |
71 | #define SWCH(opt, flag, desc) \ |
67 | { (flag), -1, NULL, (opt), NULL, (desc)} |
72 | { (flag), -1, NULL, (opt), NULL, (desc)} |
68 | |
73 | |
69 | /* convenient macros */ |
74 | /* convenient macros */ |
70 | #define optList_strlen(i) \ |
75 | #define optList_strlen(i) \ |
71 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
76 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
72 | #define optList_isBool(i) \ |
77 | #define optList_isBool(i) \ |
73 | (optList[i].flag & Opt_Boolean) |
78 | (optList[i].flag & Optflag_Boolean) |
74 | #define optList_isReverse(i) \ |
79 | #define optList_isReverse(i) \ |
75 | (optList[i].flag & Opt_Reverse) |
80 | (optList[i].flag & Optflag_Reverse) |
76 | #define optList_size \ |
81 | #define optList_size \ |
77 | (sizeof (optList) / sizeof (optList[0])) |
82 | (sizeof (optList) / sizeof (optList[0])) |
78 | |
83 | |
79 | static const struct |
84 | static const struct |
80 | { |
85 | { |
… | |
… | |
105 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
110 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
106 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
111 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
107 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
112 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
108 | #endif |
113 | #endif |
109 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
114 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
110 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
115 | BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
111 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
116 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
112 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
117 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
113 | #if TRANSPARENT |
118 | #if TRANSPARENT |
114 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), |
119 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), |
115 | SWCH ("tr", Opt_transparent, NULL), |
120 | SWCH ("tr", Opt_transparent, NULL), |
… | |
… | |
205 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
210 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
206 | #if ENABLE_STYLES |
211 | #if ENABLE_STYLES |
207 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
212 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
208 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
213 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
209 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
214 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
|
|
215 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), |
210 | #endif |
216 | #endif |
211 | #ifdef USE_XIM |
217 | #ifdef USE_XIM |
212 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
218 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
213 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
219 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
214 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
220 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
… | |
… | |
222 | #if ENABLE_XEMBED |
228 | #if ENABLE_XEMBED |
223 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
229 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
224 | #endif |
230 | #endif |
225 | #if ENABLE_FRILLS |
231 | #if ENABLE_FRILLS |
226 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
232 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
|
|
233 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
227 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
234 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
228 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
235 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
229 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
236 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
230 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
237 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
231 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
238 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
… | |
… | |
561 | #ifdef DEBUG_RESOURCES |
568 | #ifdef DEBUG_RESOURCES |
562 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
569 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
563 | optList[entry].opt, optList[entry].kw, flag); |
570 | optList[entry].opt, optList[entry].kw, flag); |
564 | #endif |
571 | #endif |
565 | if (flag == On) |
572 | if (flag == On) |
566 | options |= optList[entry].flag; |
573 | SET_OPTION (optList[entry].flag & Optflag_mask); |
567 | else |
574 | else |
568 | options &= ~optList[entry].flag; |
575 | CLR_OPTION (optList[entry].flag & Optflag_mask); |
569 | |
576 | |
570 | if (optList[entry].doff != -1) |
577 | if (optList[entry].doff != -1) |
571 | rs[optList[entry].doff] = flag; |
578 | rs[optList[entry].doff] = flag; |
572 | } |
579 | } |
573 | } |
580 | } |
… | |
… | |
855 | |
862 | |
856 | if (optList_isReverse (entry)) |
863 | if (optList_isReverse (entry)) |
857 | s = !s; |
864 | s = !s; |
858 | |
865 | |
859 | if (s) |
866 | if (s) |
860 | options |= optList[entry].flag; |
867 | SET_OPTION (optList[entry].flag & Optflag_mask); |
861 | else |
868 | else |
862 | options &= ~optList[entry].flag; |
869 | CLR_OPTION (optList[entry].flag & Optflag_mask); |
863 | } |
870 | } |
864 | } |
871 | } |
865 | |
872 | |
866 | break; |
873 | break; |
867 | } |
874 | } |
… | |
… | |
1027 | |
1034 | |
1028 | if (optList_isReverse (entry)) |
1035 | if (optList_isReverse (entry)) |
1029 | s = !s; |
1036 | s = !s; |
1030 | |
1037 | |
1031 | if (s) |
1038 | if (s) |
1032 | options |= optList[entry].flag; |
1039 | SET_OPTION (optList[entry].flag & Optflag_mask); |
1033 | else |
1040 | else |
1034 | options &= ~optList[entry].flag; |
1041 | CLR_OPTION (optList[entry].flag & Optflag_mask); |
1035 | } |
1042 | } |
1036 | } |
1043 | } |
1037 | } |
1044 | } |
1038 | |
1045 | |
1039 | /* |
1046 | /* |