ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.85 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.96 by root, Sat Jan 13 15:06:54 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h"
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h"
28#include "version.h" 28#include "version.h"
29 29
30#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 31# include "keyboard.h"
32#endif 32#endif
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 38
39/*{{{ monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
40/* 40/*
41 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 43 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 44 */
… …
117#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif 120#endif
121#if TINTING 121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 123#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
125#ifndef NO_BELL 125#ifndef NO_BELL
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 213#if ENABLE_XEMBED
214 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"),
215#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
216#if ENABLE_FRILLS 219#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 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"), 221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
219 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
220 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 223 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"), 224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
264#undef INFO 266#undef INFO
265#undef STRG 267#undef STRG
266#undef RSTRG 268#undef RSTRG
267#undef SWCH 269#undef SWCH
268#undef BOOL 270#undef BOOL
269/*}}} */
270 271
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
273#if ENABLE_PERL 274#if ENABLE_PERL
274 "perl," 275 "perl,"
… …
320#if TINTING 321#if TINTING
321 "tint," 322 "tint,"
322#endif 323#endif
323#if defined(USE_XIM) 324#if defined(USE_XIM)
324 "XIM," 325 "XIM,"
326#endif
327#if defined(NO_BACKSPACE_KEY)
328 "no_backspace,"
329#endif
330#if defined(NO_DELETE_KEY)
331 "no_delete,"
332#endif
333#if EIGHT_BIT_CONTROLS
334 "8bitctrls,"
335#endif
336#if defined(ENABLE_FRILLS)
337 "frills,"
338#endif
339#if defined(SELECTION_SCROLLING)
340 "selectionscrolling,"
341#endif
342#if MOUSE_WHEEL
343 "wheel,"
344#endif
345#if MOUSE_SLIP_WHEELING
346 "slipwheel,"
347#endif
348#if defined(SMART_RESIZE)
349 "smart-resize,"
350#endif
351#if defined(CURSOR_BLINK)
352 "cursorBlink,"
353#endif
354#if defined(POINTER_BLANK)
355 "pointerBlank,"
356#endif
357#if defined(NO_RESOURCES)
358 "NoResources,"
325#endif 359#endif
326 "scrollbars=" 360 "scrollbars="
327#if !defined(HAVE_SCROLLBARS) 361#if !defined(HAVE_SCROLLBARS)
328 "NONE" 362 "NONE"
329#else 363#else
… …
347# endif 381# endif
348# if defined(XTERM_SCROLLBAR) 382# if defined(XTERM_SCROLLBAR)
349 "xterm" 383 "xterm"
350# endif 384# endif
351#endif 385#endif
352 ","
353#if defined(NO_BACKSPACE_KEY)
354 "no_backspace,"
355#endif
356#if defined(NO_DELETE_KEY)
357 "no_delete,"
358#endif
359#if EIGHT_BIT_CONTROLS
360 "8bitctrls,"
361#endif
362#if defined(ENABLE_FRILLS)
363 "frills,"
364#endif
365#if defined(SELECTION_SCROLLING)
366 "selectionscrolling,"
367#endif
368#if MOUSE_WHEEL
369 "wheel,"
370#endif
371#if MOUSE_SLIP_WHEELING
372 "slipwheel,"
373#endif
374#if defined(SMART_RESIZE)
375 "smart-resize,"
376#endif
377#if defined(CURSOR_BLINK)
378 "cursorBlink,"
379#endif
380#if defined(POINTER_BLANK)
381 "pointerBlank,"
382#endif
383#if defined(NO_RESOURCES)
384 "NoResources"
385#endif
386 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
387 387
388#define INDENT 18 388#define INDENT 18
389
390const char rxvt_term::resval_undef [] = "<undef>";
391const char rxvt_term::resval_on [] = "on";
392const char rxvt_term::resval_off [] = "off";
389 393
390/*{{{ usage: */ 394/*{{{ usage: */
391/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
392static void 396static void
393rxvt_usage (int type) 397rxvt_usage (int type)
… …
402 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
403 407
404 for (col = 1, i = 0; i < optList_size; i++) 408 for (col = 1, i = 0; i < optList_size; i++)
405 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
406 { 410 {
407 int len = 0; 411 int len = 0;
408 412
409 if (!optList_isBool (i)) 413 if (!optList_isBool (i))
410 { 414 {
411 len = optList_strlen (i); 415 len = optList_strlen (i);
412 if (len > 0) 416 if (len > 0)
… …
479 483
480/*{{{ get command-line options before getting resources */ 484/*{{{ get command-line options before getting resources */
481void 485void
482rxvt_term::get_options (int argc, const char *const *argv) 486rxvt_term::get_options (int argc, const char *const *argv)
483{ 487{
484 int i, bad_option = 0; 488 int i, bad_option = 0;
485 static const char On[3] = "ON", Off[4] = "OFF";
486 489
487 for (i = 1; i < argc; i++) 490 for (i = 1; i < argc; i++)
488 { 491 {
489 unsigned int entry, longopt = 0; 492 unsigned int entry, longopt = 0;
490 const char *flag, *opt; 493 const char *flag, *opt;
491 494
492 opt = argv[i]; 495 opt = argv[i];
493 496
494 if (*opt == '-') 497 if (*opt == '-')
495 { 498 {
496 flag = On; 499 flag = resval_on;
500
497 if (*++opt == '-') 501 if (*++opt == '-')
498 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
499 } 503 }
500 else if (*opt == '+') 504 else if (*opt == '+')
501 { 505 {
502 flag = Off; 506 flag = resval_off;
507
503 if (*++opt == '+') 508 if (*++opt == '+')
504 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
505 } 510 }
506 else 511 else
507 { 512 {
… …
510 continue; 515 continue;
511 } 516 }
512 517
513 if (!strcmp (opt, "help")) 518 if (!strcmp (opt, "help"))
514 rxvt_usage (longopt ? 2 : 1); 519 rxvt_usage (longopt ? 2 : 1);
520
515 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
516 rxvt_usage (0); 522 rxvt_usage (0);
517 523
518 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
519 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < optList_size; entry++)
… …
523 break; 529 break;
524 530
525 if (entry < optList_size) 531 if (entry < optList_size)
526 { 532 {
527 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
528 flag = flag == On ? Off : On; 534 flag = flag == resval_on ? resval_off : resval_on;
529 535
530 if (optList_strlen (entry)) 536 if (optList_strlen (entry))
531 { 537 {
532 /* 538 /*
533 * special cases are handled in main.c:main () to allow 539 * special cases are handled in main.c:main () to allow
534 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
535 * default values 541 * default values
536 */ 542 */
537 543
538 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
545 {
546 if (flag == resval_on && !argv [i+1])
547 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
548
539 rs[optList[entry].doff] = flag == On && argv[i+1] 549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
540 ? argv[++i] : 0; 550 }
541 } 551 }
542 else 552 else
543 { /* boolean value */ 553 { /* boolean value */
544 set_option (optList[entry].flag & Optflag_mask, flag == On); 554 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
545 555
546 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
548 } 558 }
549 } 559 }
… …
764} 774}
765 775
766const char * 776const char *
767rxvt_term::x_resource (const char *name) 777rxvt_term::x_resource (const char *name)
768{ 778{
769 XrmDatabase database = XrmGetDatabase (display->display); 779 XrmDatabase database = XrmGetDatabase (dpy);
770 780
771 const char *p = get_res (database, rs[Rs_name], name); 781 const char *p = get_res (database, rs[Rs_name], name);
772 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
773 783
774 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 784 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
826 836
827 /* 837 /*
828 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
829 */ 839 */
830# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
831 XrmDatabase database = XrmGetDatabase (display->display); 841 XrmDatabase database = XrmGetDatabase (dpy);
832 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
833 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
834 844
835 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
836 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines