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.83 by root, Sat Jan 21 22:38:06 2006 UTC vs.
Revision 1.93 by root, Wed Feb 1 21:15:33 2006 UTC

… …
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/* #define DEBUG_RESOURCES */
40
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
45 * 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 ()
46 */ 44 */
… …
213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
214 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"),
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
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
218#if ENABLE_FRILLS 219#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 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"),
221 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"),
222 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"),
… …
265#undef INFO 266#undef INFO
266#undef STRG 267#undef STRG
267#undef RSTRG 268#undef RSTRG
268#undef SWCH 269#undef SWCH
269#undef BOOL 270#undef BOOL
270/*}}} */
271 271
272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
273static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
274#if ENABLE_PERL 274#if ENABLE_PERL
275 "perl," 275 "perl,"
… …
321#if TINTING 321#if TINTING
322 "tint," 322 "tint,"
323#endif 323#endif
324#if defined(USE_XIM) 324#if defined(USE_XIM)
325 "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,"
326#endif 359#endif
327 "scrollbars=" 360 "scrollbars="
328#if !defined(HAVE_SCROLLBARS) 361#if !defined(HAVE_SCROLLBARS)
329 "NONE" 362 "NONE"
330#else 363#else
… …
348# endif 381# endif
349# if defined(XTERM_SCROLLBAR) 382# if defined(XTERM_SCROLLBAR)
350 "xterm" 383 "xterm"
351# endif 384# endif
352#endif 385#endif
353 ","
354#if defined(NO_BACKSPACE_KEY)
355 "no_backspace,"
356#endif
357#if defined(NO_DELETE_KEY)
358 "no_delete,"
359#endif
360#if EIGHT_BIT_CONTROLS
361 "8bitctrls,"
362#endif
363#if defined(ENABLE_FRILLS)
364 "frills,"
365#endif
366#if defined(PREFER_24BIT)
367 "24bit,"
368#endif
369#if defined(SELECTION_SCROLLING)
370 "selectionscrolling,"
371#endif
372#if MOUSE_WHEEL
373 "wheel,"
374#endif
375#if MOUSE_SLIP_WHEELING
376 "slipwheel,"
377#endif
378#if defined(SMART_RESIZE)
379 "smart-resize,"
380#endif
381#if defined(CURSOR_BLINK)
382 "cursorBlink,"
383#endif
384#if defined(POINTER_BLANK)
385 "pointerBlank,"
386#endif
387#if defined(NO_RESOURCES)
388 "NoResources"
389#endif
390 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
391 387
392#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";
393 393
394/*{{{ usage: */ 394/*{{{ usage: */
395/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
396static void 396static void
397rxvt_usage (int type) 397rxvt_usage (int type)
… …
406 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
407 407
408 for (col = 1, i = 0; i < optList_size; i++) 408 for (col = 1, i = 0; i < optList_size; i++)
409 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
410 { 410 {
411 int len = 0; 411 int len = 0;
412 412
413 if (!optList_isBool (i)) 413 if (!optList_isBool (i))
414 { 414 {
415 len = optList_strlen (i); 415 len = optList_strlen (i);
416 if (len > 0) 416 if (len > 0)
… …
483 483
484/*{{{ get command-line options before getting resources */ 484/*{{{ get command-line options before getting resources */
485void 485void
486rxvt_term::get_options (int argc, const char *const *argv) 486rxvt_term::get_options (int argc, const char *const *argv)
487{ 487{
488 int i, bad_option = 0; 488 int i, bad_option = 0;
489 static const char On[3] = "ON", Off[4] = "OFF";
490 489
491 for (i = 1; i < argc; i++) 490 for (i = 1; i < argc; i++)
492 { 491 {
493 unsigned int entry, longopt = 0; 492 unsigned int entry, longopt = 0;
494 const char *flag, *opt; 493 const char *flag, *opt;
495 494
496 opt = argv[i]; 495 opt = argv[i];
497#ifdef DEBUG_RESOURCES 496
498 fprintf (stderr, "argv[%d] = %s: ", i, opt);
499#endif
500 if (*opt == '-') 497 if (*opt == '-')
501 { 498 {
502 flag = On; 499 flag = resval_on;
500
503 if (*++opt == '-') 501 if (*++opt == '-')
504 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
505 } 503 }
506 else if (*opt == '+') 504 else if (*opt == '+')
507 { 505 {
508 flag = Off; 506 flag = resval_off;
507
509 if (*++opt == '+') 508 if (*++opt == '+')
510 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
511 } 510 }
512 else 511 else
513 { 512 {
… …
516 continue; 515 continue;
517 } 516 }
518 517
519 if (!strcmp (opt, "help")) 518 if (!strcmp (opt, "help"))
520 rxvt_usage (longopt ? 2 : 1); 519 rxvt_usage (longopt ? 2 : 1);
520
521 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
522 rxvt_usage (0); 522 rxvt_usage (0);
523 523
524 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
525 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < optList_size; entry++)
… …
529 break; 529 break;
530 530
531 if (entry < optList_size) 531 if (entry < optList_size)
532 { 532 {
533 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
534 flag = flag == On ? Off : On; 534 flag = flag == resval_on ? resval_off : resval_on;
535 535
536 if (optList_strlen (entry)) 536 if (optList_strlen (entry))
537 { 537 {
538 /* 538 /*
539 * special cases are handled in main.c:main () to allow 539 * special cases are handled in main.c:main () to allow
540 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
541 * default values 541 * default values
542 */ 542 */
543 543
544 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
545 rs[optList[entry].doff] = flag == On && argv[i+1] 549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
546 ? argv[++i] : 0; 550 }
547 } 551 }
548 else 552 else
549 { /* boolean value */ 553 { /* boolean value */
550#ifdef DEBUG_RESOURCES
551 fprintf (stderr, "boolean (%s,%s) = %s\n",
552 optList[entry].opt, optList[entry].kw, flag);
553#endif
554 set_option (optList[entry].flag & Optflag_mask, flag == On); 554 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
555 555
556 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
557 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
558 } 558 }
559 } 559 }
… …
774} 774}
775 775
776const char * 776const char *
777rxvt_term::x_resource (const char *name) 777rxvt_term::x_resource (const char *name)
778{ 778{
779 XrmDatabase database = XrmGetDatabase (display->display); 779 XrmDatabase database = XrmGetDatabase (xdisp);
780 780
781 const char *p = get_res (database, rs[Rs_name], name); 781 const char *p = get_res (database, rs[Rs_name], name);
782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
783 783
784 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 784 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
836 836
837 /* 837 /*
838 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
839 */ 839 */
840# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (display->display); 841 XrmDatabase database = XrmGetDatabase (xdisp);
842 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
843 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
844 844
845 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
846 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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