… | |
… | |
33 | |
33 | |
34 | /* place holders used for parsing command-line options */ |
34 | /* place holders used for parsing command-line options */ |
35 | #define Optflag_Reverse 0x40000000UL |
35 | #define Optflag_Reverse 0x40000000UL |
36 | #define Optflag_Boolean 0x80000000UL |
36 | #define Optflag_Boolean 0x80000000UL |
37 | #define Optflag_mask 0x3fffffffUL |
37 | #define Optflag_mask 0x3fffffffUL |
38 | |
|
|
39 | /* #define DEBUG_RESOURCES */ |
|
|
40 | |
38 | |
41 | /*{{{ monolithic option/resource structure: */ |
39 | /*{{{ monolithic option/resource structure: */ |
42 | /* |
40 | /* |
43 | * `string' options MUST have a usage argument |
41 | * `string' options MUST have a usage argument |
44 | * `switch' and `boolean' options have no argument |
42 | * `switch' and `boolean' options have no argument |
… | |
… | |
187 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
185 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
188 | #endif /* NO_CURSORCOLOR */ |
186 | #endif /* NO_CURSORCOLOR */ |
189 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
187 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
190 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
188 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
191 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
189 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
192 | #if defined (XPM_BACKGROUND) || (MENUBAR_MAX) |
190 | #ifdef XPM_BACKGROUND |
193 | RSTRG (Rs_path, "path", "search path"), |
191 | RSTRG (Rs_path, "path", "search path"), |
194 | #endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ |
|
|
195 | #ifdef XPM_BACKGROUND |
|
|
196 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
192 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
197 | #endif /* XPM_BACKGROUND */ |
|
|
198 | #if (MENUBAR_MAX) |
|
|
199 | RSTRG (Rs_menu, "menu", "name[;tag]"), |
|
|
200 | #endif |
193 | #endif |
201 | /* fonts: command-line option = resource name */ |
194 | /* fonts: command-line option = resource name */ |
202 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
195 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
203 | #if ENABLE_STYLES |
196 | #if ENABLE_STYLES |
204 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
197 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
… | |
… | |
220 | #if ENABLE_XEMBED |
213 | #if ENABLE_XEMBED |
221 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
214 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
222 | #endif |
215 | #endif |
223 | #if ENABLE_FRILLS |
216 | #if ENABLE_FRILLS |
224 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
217 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
|
|
218 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), |
225 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
219 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
226 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
220 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
|
|
221 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
227 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
222 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
228 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
223 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
229 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
224 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
230 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
225 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
231 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
226 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
… | |
… | |
322 | #if defined(TRANSPARENT) |
317 | #if defined(TRANSPARENT) |
323 | "transparent," |
318 | "transparent," |
324 | #endif |
319 | #endif |
325 | #if TINTING |
320 | #if TINTING |
326 | "tint," |
321 | "tint," |
327 | #endif |
|
|
328 | #if defined(UTMP_SUPPORT) |
|
|
329 | "utmp," |
|
|
330 | #endif |
|
|
331 | #if defined(MENUBAR) |
|
|
332 | "menubar," |
|
|
333 | #endif |
322 | #endif |
334 | #if defined(USE_XIM) |
323 | #if defined(USE_XIM) |
335 | "XIM," |
324 | "XIM," |
336 | #endif |
325 | #endif |
337 | "scrollbars=" |
326 | "scrollbars=" |
… | |
… | |
368 | "no_delete," |
357 | "no_delete," |
369 | #endif |
358 | #endif |
370 | #if EIGHT_BIT_CONTROLS |
359 | #if EIGHT_BIT_CONTROLS |
371 | "8bitctrls," |
360 | "8bitctrls," |
372 | #endif |
361 | #endif |
373 | #if !defined(NO_STRINGS) |
|
|
374 | "strings," |
|
|
375 | #endif |
|
|
376 | #if defined(ENABLE_FRILLS) |
362 | #if defined(ENABLE_FRILLS) |
377 | "frills," |
363 | "frills," |
378 | #endif |
364 | #endif |
379 | #if defined(PREFER_24BIT) |
|
|
380 | "24bit," |
|
|
381 | #endif |
|
|
382 | #if defined(SELECTION_SCROLLING) |
365 | #if defined(SELECTION_SCROLLING) |
383 | "selectionscrolling," |
366 | "selectionscrolling," |
384 | #endif |
367 | #endif |
385 | #if MOUSE_WHEEL |
368 | #if MOUSE_WHEEL |
386 | "wheel," |
369 | "wheel," |
… | |
… | |
396 | #endif |
379 | #endif |
397 | #if defined(POINTER_BLANK) |
380 | #if defined(POINTER_BLANK) |
398 | "pointerBlank," |
381 | "pointerBlank," |
399 | #endif |
382 | #endif |
400 | #if defined(NO_RESOURCES) |
383 | #if defined(NO_RESOURCES) |
401 | "NoResources" |
384 | "NoResources," |
402 | #endif |
385 | #endif |
|
|
386 | "v" VERSION |
403 | "\nUsage: "; /* Usage */ |
387 | "\nUsage: "; /* Usage */ |
404 | |
388 | |
405 | #define INDENT 18 |
389 | #define INDENT 18 |
406 | |
390 | |
407 | /*{{{ usage: */ |
391 | /*{{{ usage: */ |
… | |
… | |
505 | { |
489 | { |
506 | unsigned int entry, longopt = 0; |
490 | unsigned int entry, longopt = 0; |
507 | const char *flag, *opt; |
491 | const char *flag, *opt; |
508 | |
492 | |
509 | opt = argv[i]; |
493 | opt = argv[i]; |
510 | #ifdef DEBUG_RESOURCES |
494 | |
511 | fprintf (stderr, "argv[%d] = %s: ", i, opt); |
|
|
512 | #endif |
|
|
513 | if (*opt == '-') |
495 | if (*opt == '-') |
514 | { |
496 | { |
515 | flag = On; |
497 | flag = On; |
516 | if (*++opt == '-') |
498 | if (*++opt == '-') |
517 | longopt = *opt++; /* long option */ |
499 | longopt = *opt++; /* long option */ |
… | |
… | |
558 | rs[optList[entry].doff] = flag == On && argv[i+1] |
540 | rs[optList[entry].doff] = flag == On && argv[i+1] |
559 | ? argv[++i] : 0; |
541 | ? argv[++i] : 0; |
560 | } |
542 | } |
561 | else |
543 | else |
562 | { /* boolean value */ |
544 | { /* boolean value */ |
563 | #ifdef DEBUG_RESOURCES |
|
|
564 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
|
|
565 | optList[entry].opt, optList[entry].kw, flag); |
|
|
566 | #endif |
|
|
567 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
545 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
568 | |
546 | |
569 | if (optList[entry].doff != -1) |
547 | if (optList[entry].doff != -1) |
570 | rs[optList[entry].doff] = flag; |
548 | rs[optList[entry].doff] = flag; |
571 | } |
549 | } |
… | |
… | |
604 | * "rxvt" "keysym" "0xFF01" |
582 | * "rxvt" "keysym" "0xFF01" |
605 | * value will be a string |
583 | * value will be a string |
606 | */ |
584 | */ |
607 | /* ARGSUSED */ |
585 | /* ARGSUSED */ |
608 | int |
586 | int |
609 | rxvt_define_key (XrmDatabase *database __attribute__((unused)), |
587 | rxvt_define_key (XrmDatabase *database UNUSED, |
610 | XrmBindingList bindings __attribute__((unused)), |
588 | XrmBindingList bindings UNUSED, |
611 | XrmQuarkList quarks, |
589 | XrmQuarkList quarks, |
612 | XrmRepresentation *type __attribute__((unused)), |
590 | XrmRepresentation *type UNUSED, |
613 | XrmValue *value, |
591 | XrmValue *value, |
614 | XPointer closure __attribute__((unused))) |
592 | XPointer closure UNUSED) |
615 | { |
593 | { |
616 | int last; |
594 | int last; |
617 | |
595 | |
618 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
596 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
619 | ; |
597 | ; |
… | |
… | |
787 | } |
765 | } |
788 | |
766 | |
789 | const char * |
767 | const char * |
790 | rxvt_term::x_resource (const char *name) |
768 | rxvt_term::x_resource (const char *name) |
791 | { |
769 | { |
792 | XrmDatabase database = XrmGetDatabase (display->display); |
770 | XrmDatabase database = XrmGetDatabase (xdisp); |
793 | |
771 | |
794 | const char *p = get_res (database, rs[Rs_name], name); |
772 | const char *p = get_res (database, rs[Rs_name], name); |
795 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
773 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
796 | |
774 | |
797 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
775 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
… | |
… | |
849 | |
827 | |
850 | /* |
828 | /* |
851 | * [R5 or later]: enumerate the resource database |
829 | * [R5 or later]: enumerate the resource database |
852 | */ |
830 | */ |
853 | # ifdef KEYSYM_RESOURCE |
831 | # ifdef KEYSYM_RESOURCE |
854 | XrmDatabase database = XrmGetDatabase (display->display); |
832 | XrmDatabase database = XrmGetDatabase (xdisp); |
855 | XrmName name_prefix[3]; |
833 | XrmName name_prefix[3]; |
856 | XrmClass class_prefix[3]; |
834 | XrmClass class_prefix[3]; |
857 | |
835 | |
858 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
836 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
859 | name_prefix[1] = XrmStringToName ("keysym"); |
837 | name_prefix[1] = XrmStringToName ("keysym"); |