| … | |
… | |
| 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=" |
| … | |
… | |
| 371 | "8bitctrls," |
360 | "8bitctrls," |
| 372 | #endif |
361 | #endif |
| 373 | #if defined(ENABLE_FRILLS) |
362 | #if defined(ENABLE_FRILLS) |
| 374 | "frills," |
363 | "frills," |
| 375 | #endif |
364 | #endif |
| 376 | #if defined(PREFER_24BIT) |
|
|
| 377 | "24bit," |
|
|
| 378 | #endif |
|
|
| 379 | #if defined(SELECTION_SCROLLING) |
365 | #if defined(SELECTION_SCROLLING) |
| 380 | "selectionscrolling," |
366 | "selectionscrolling," |
| 381 | #endif |
367 | #endif |
| 382 | #if MOUSE_WHEEL |
368 | #if MOUSE_WHEEL |
| 383 | "wheel," |
369 | "wheel," |
| … | |
… | |
| 502 | { |
488 | { |
| 503 | unsigned int entry, longopt = 0; |
489 | unsigned int entry, longopt = 0; |
| 504 | const char *flag, *opt; |
490 | const char *flag, *opt; |
| 505 | |
491 | |
| 506 | opt = argv[i]; |
492 | opt = argv[i]; |
| 507 | #ifdef DEBUG_RESOURCES |
493 | |
| 508 | fprintf (stderr, "argv[%d] = %s: ", i, opt); |
|
|
| 509 | #endif |
|
|
| 510 | if (*opt == '-') |
494 | if (*opt == '-') |
| 511 | { |
495 | { |
| 512 | flag = On; |
496 | flag = On; |
| 513 | if (*++opt == '-') |
497 | if (*++opt == '-') |
| 514 | longopt = *opt++; /* long option */ |
498 | longopt = *opt++; /* long option */ |
| … | |
… | |
| 555 | rs[optList[entry].doff] = flag == On && argv[i+1] |
539 | rs[optList[entry].doff] = flag == On && argv[i+1] |
| 556 | ? argv[++i] : 0; |
540 | ? argv[++i] : 0; |
| 557 | } |
541 | } |
| 558 | else |
542 | else |
| 559 | { /* boolean value */ |
543 | { /* boolean value */ |
| 560 | #ifdef DEBUG_RESOURCES |
|
|
| 561 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
|
|
| 562 | optList[entry].opt, optList[entry].kw, flag); |
|
|
| 563 | #endif |
|
|
| 564 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
544 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
| 565 | |
545 | |
| 566 | if (optList[entry].doff != -1) |
546 | if (optList[entry].doff != -1) |
| 567 | rs[optList[entry].doff] = flag; |
547 | rs[optList[entry].doff] = flag; |
| 568 | } |
548 | } |
| … | |
… | |
| 601 | * "rxvt" "keysym" "0xFF01" |
581 | * "rxvt" "keysym" "0xFF01" |
| 602 | * value will be a string |
582 | * value will be a string |
| 603 | */ |
583 | */ |
| 604 | /* ARGSUSED */ |
584 | /* ARGSUSED */ |
| 605 | int |
585 | int |
| 606 | rxvt_define_key (XrmDatabase *database __attribute__((unused)), |
586 | rxvt_define_key (XrmDatabase *database UNUSED, |
| 607 | XrmBindingList bindings __attribute__((unused)), |
587 | XrmBindingList bindings UNUSED, |
| 608 | XrmQuarkList quarks, |
588 | XrmQuarkList quarks, |
| 609 | XrmRepresentation *type __attribute__((unused)), |
589 | XrmRepresentation *type UNUSED, |
| 610 | XrmValue *value, |
590 | XrmValue *value, |
| 611 | XPointer closure __attribute__((unused))) |
591 | XPointer closure UNUSED) |
| 612 | { |
592 | { |
| 613 | int last; |
593 | int last; |
| 614 | |
594 | |
| 615 | 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 */ |
| 616 | ; |
596 | ; |
| … | |
… | |
| 784 | } |
764 | } |
| 785 | |
765 | |
| 786 | const char * |
766 | const char * |
| 787 | rxvt_term::x_resource (const char *name) |
767 | rxvt_term::x_resource (const char *name) |
| 788 | { |
768 | { |
| 789 | XrmDatabase database = XrmGetDatabase (display->display); |
769 | XrmDatabase database = XrmGetDatabase (xdisp); |
| 790 | |
770 | |
| 791 | const char *p = get_res (database, rs[Rs_name], name); |
771 | const char *p = get_res (database, rs[Rs_name], name); |
| 792 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
772 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
| 793 | |
773 | |
| 794 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
774 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
| … | |
… | |
| 846 | |
826 | |
| 847 | /* |
827 | /* |
| 848 | * [R5 or later]: enumerate the resource database |
828 | * [R5 or later]: enumerate the resource database |
| 849 | */ |
829 | */ |
| 850 | # ifdef KEYSYM_RESOURCE |
830 | # ifdef KEYSYM_RESOURCE |
| 851 | XrmDatabase database = XrmGetDatabase (display->display); |
831 | XrmDatabase database = XrmGetDatabase (xdisp); |
| 852 | XrmName name_prefix[3]; |
832 | XrmName name_prefix[3]; |
| 853 | XrmClass class_prefix[3]; |
833 | XrmClass class_prefix[3]; |
| 854 | |
834 | |
| 855 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
835 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
| 856 | name_prefix[1] = XrmStringToName ("keysym"); |
836 | name_prefix[1] = XrmStringToName ("keysym"); |
