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

Diff Legend

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