… | |
… | |
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 |
… | |
… | |
215 | #if ENABLE_XEMBED |
213 | #if ENABLE_XEMBED |
216 | 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"), |
217 | #endif |
215 | #endif |
218 | #if ENABLE_FRILLS |
216 | #if ENABLE_FRILLS |
219 | 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"), |
220 | 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"), |
221 | 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"), |
222 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
222 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
223 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
223 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
224 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
224 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
225 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
225 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
226 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
226 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
… | |
… | |
317 | #if defined(TRANSPARENT) |
317 | #if defined(TRANSPARENT) |
318 | "transparent," |
318 | "transparent," |
319 | #endif |
319 | #endif |
320 | #if TINTING |
320 | #if TINTING |
321 | "tint," |
321 | "tint," |
322 | #endif |
|
|
323 | #if defined(UTMP_SUPPORT) |
|
|
324 | "utmp," |
|
|
325 | #endif |
322 | #endif |
326 | #if defined(USE_XIM) |
323 | #if defined(USE_XIM) |
327 | "XIM," |
324 | "XIM," |
328 | #endif |
325 | #endif |
329 | "scrollbars=" |
326 | "scrollbars=" |
… | |
… | |
363 | "8bitctrls," |
360 | "8bitctrls," |
364 | #endif |
361 | #endif |
365 | #if defined(ENABLE_FRILLS) |
362 | #if defined(ENABLE_FRILLS) |
366 | "frills," |
363 | "frills," |
367 | #endif |
364 | #endif |
368 | #if defined(PREFER_24BIT) |
|
|
369 | "24bit," |
|
|
370 | #endif |
|
|
371 | #if defined(SELECTION_SCROLLING) |
365 | #if defined(SELECTION_SCROLLING) |
372 | "selectionscrolling," |
366 | "selectionscrolling," |
373 | #endif |
367 | #endif |
374 | #if MOUSE_WHEEL |
368 | #if MOUSE_WHEEL |
375 | "wheel," |
369 | "wheel," |
… | |
… | |
494 | { |
488 | { |
495 | unsigned int entry, longopt = 0; |
489 | unsigned int entry, longopt = 0; |
496 | const char *flag, *opt; |
490 | const char *flag, *opt; |
497 | |
491 | |
498 | opt = argv[i]; |
492 | opt = argv[i]; |
499 | #ifdef DEBUG_RESOURCES |
493 | |
500 | fprintf (stderr, "argv[%d] = %s: ", i, opt); |
|
|
501 | #endif |
|
|
502 | if (*opt == '-') |
494 | if (*opt == '-') |
503 | { |
495 | { |
504 | flag = On; |
496 | flag = On; |
505 | if (*++opt == '-') |
497 | if (*++opt == '-') |
506 | longopt = *opt++; /* long option */ |
498 | longopt = *opt++; /* long option */ |
… | |
… | |
547 | rs[optList[entry].doff] = flag == On && argv[i+1] |
539 | rs[optList[entry].doff] = flag == On && argv[i+1] |
548 | ? argv[++i] : 0; |
540 | ? argv[++i] : 0; |
549 | } |
541 | } |
550 | else |
542 | else |
551 | { /* boolean value */ |
543 | { /* boolean value */ |
552 | #ifdef DEBUG_RESOURCES |
|
|
553 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
|
|
554 | optList[entry].opt, optList[entry].kw, flag); |
|
|
555 | #endif |
|
|
556 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
544 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
557 | |
545 | |
558 | if (optList[entry].doff != -1) |
546 | if (optList[entry].doff != -1) |
559 | rs[optList[entry].doff] = flag; |
547 | rs[optList[entry].doff] = flag; |
560 | } |
548 | } |
… | |
… | |
593 | * "rxvt" "keysym" "0xFF01" |
581 | * "rxvt" "keysym" "0xFF01" |
594 | * value will be a string |
582 | * value will be a string |
595 | */ |
583 | */ |
596 | /* ARGSUSED */ |
584 | /* ARGSUSED */ |
597 | int |
585 | int |
598 | rxvt_define_key (XrmDatabase *database __attribute__((unused)), |
586 | rxvt_define_key (XrmDatabase *database UNUSED, |
599 | XrmBindingList bindings __attribute__((unused)), |
587 | XrmBindingList bindings UNUSED, |
600 | XrmQuarkList quarks, |
588 | XrmQuarkList quarks, |
601 | XrmRepresentation *type __attribute__((unused)), |
589 | XrmRepresentation *type UNUSED, |
602 | XrmValue *value, |
590 | XrmValue *value, |
603 | XPointer closure __attribute__((unused))) |
591 | XPointer closure UNUSED) |
604 | { |
592 | { |
605 | int last; |
593 | int last; |
606 | |
594 | |
607 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
595 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
608 | ; |
596 | ; |
… | |
… | |
776 | } |
764 | } |
777 | |
765 | |
778 | const char * |
766 | const char * |
779 | rxvt_term::x_resource (const char *name) |
767 | rxvt_term::x_resource (const char *name) |
780 | { |
768 | { |
781 | XrmDatabase database = XrmGetDatabase (display->display); |
769 | XrmDatabase database = XrmGetDatabase (xdisp); |
782 | |
770 | |
783 | const char *p = get_res (database, rs[Rs_name], name); |
771 | const char *p = get_res (database, rs[Rs_name], name); |
784 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
772 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
785 | |
773 | |
786 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
774 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
… | |
… | |
838 | |
826 | |
839 | /* |
827 | /* |
840 | * [R5 or later]: enumerate the resource database |
828 | * [R5 or later]: enumerate the resource database |
841 | */ |
829 | */ |
842 | # ifdef KEYSYM_RESOURCE |
830 | # ifdef KEYSYM_RESOURCE |
843 | XrmDatabase database = XrmGetDatabase (display->display); |
831 | XrmDatabase database = XrmGetDatabase (xdisp); |
844 | XrmName name_prefix[3]; |
832 | XrmName name_prefix[3]; |
845 | XrmClass class_prefix[3]; |
833 | XrmClass class_prefix[3]; |
846 | |
834 | |
847 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
835 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
848 | name_prefix[1] = XrmStringToName ("keysym"); |
836 | name_prefix[1] = XrmStringToName ("keysym"); |