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.90 by root, Tue Jan 31 19:53:31 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
… …
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"),
… …
319#if TINTING 322#if TINTING
320 "tint," 323 "tint,"
321#endif 324#endif
322#if defined(USE_XIM) 325#if defined(USE_XIM)
323 "XIM," 326 "XIM,"
327#endif
328#if defined(NO_BACKSPACE_KEY)
329 "no_backspace,"
330#endif
331#if defined(NO_DELETE_KEY)
332 "no_delete,"
333#endif
334#if EIGHT_BIT_CONTROLS
335 "8bitctrls,"
336#endif
337#if defined(ENABLE_FRILLS)
338 "frills,"
339#endif
340#if defined(SELECTION_SCROLLING)
341 "selectionscrolling,"
342#endif
343#if MOUSE_WHEEL
344 "wheel,"
345#endif
346#if MOUSE_SLIP_WHEELING
347 "slipwheel,"
348#endif
349#if defined(SMART_RESIZE)
350 "smart-resize,"
351#endif
352#if defined(CURSOR_BLINK)
353 "cursorBlink,"
354#endif
355#if defined(POINTER_BLANK)
356 "pointerBlank,"
357#endif
358#if defined(NO_RESOURCES)
359 "NoResources,"
324#endif 360#endif
325 "scrollbars=" 361 "scrollbars="
326#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
327 "NONE" 363 "NONE"
328#else 364#else
… …
346# endif 382# endif
347# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
348 "xterm" 384 "xterm"
349# endif 385# endif
350#endif 386#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 */ 387 "\nUsage: "; /* Usage */
389 388
390#define INDENT 18 389#define INDENT 18
390
391const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off";
391 394
392/*{{{ usage: */ 395/*{{{ usage: */
393/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
394static void 397static void
395rxvt_usage (int type) 398rxvt_usage (int type)
… …
482/*{{{ get command-line options before getting resources */ 485/*{{{ get command-line options before getting resources */
483void 486void
484rxvt_term::get_options (int argc, const char *const *argv) 487rxvt_term::get_options (int argc, const char *const *argv)
485{ 488{
486 int i, bad_option = 0; 489 int i, bad_option = 0;
487 static const char On[3] = "ON", Off[4] = "OFF";
488 490
489 for (i = 1; i < argc; i++) 491 for (i = 1; i < argc; i++)
490 { 492 {
491 unsigned int entry, longopt = 0; 493 unsigned int entry, longopt = 0;
492 const char *flag, *opt; 494 const char *flag, *opt;
493 495
494 opt = argv[i]; 496 opt = argv[i];
495 497
496 if (*opt == '-') 498 if (*opt == '-')
497 { 499 {
498 flag = On; 500 flag = resval_on;
501
499 if (*++opt == '-') 502 if (*++opt == '-')
500 longopt = *opt++; /* long option */ 503 longopt = *opt++; /* long option */
501 } 504 }
502 else if (*opt == '+') 505 else if (*opt == '+')
503 { 506 {
504 flag = Off; 507 flag = resval_off;
508
505 if (*++opt == '+') 509 if (*++opt == '+')
506 longopt = *opt++; /* long option */ 510 longopt = *opt++; /* long option */
507 } 511 }
508 else 512 else
509 { 513 {
… …
512 continue; 516 continue;
513 } 517 }
514 518
515 if (!strcmp (opt, "help")) 519 if (!strcmp (opt, "help"))
516 rxvt_usage (longopt ? 2 : 1); 520 rxvt_usage (longopt ? 2 : 1);
521
517 if (!strcmp (opt, "h")) 522 if (!strcmp (opt, "h"))
518 rxvt_usage (0); 523 rxvt_usage (0);
519 524
520 /* feature: always try to match long-options */ 525 /* feature: always try to match long-options */
521 for (entry = 0; entry < optList_size; entry++) 526 for (entry = 0; entry < optList_size; entry++)
… …
525 break; 530 break;
526 531
527 if (entry < optList_size) 532 if (entry < optList_size)
528 { 533 {
529 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
530 flag = flag == On ? Off : On; 535 flag = flag == resval_on ? resval_off : resval_on;
531 536
532 if (optList_strlen (entry)) 537 if (optList_strlen (entry))
533 { 538 {
534 /* 539 /*
535 * special cases are handled in main.c:main () to allow 540 * special cases are handled in main.c:main () to allow
536 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
537 * default values 542 * default values
538 */ 543 */
539 544
540 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
541 rs[optList[entry].doff] = flag == On && argv[i+1] 546 rs[optList[entry].doff] = flag == resval_on && argv[i+1]
542 ? argv[++i] : 0; 547 ? argv[++i] : resval_undef;
548
549 if (optList[entry].doff == Rs_color + Color_tint) printf ("doff %d is %s\n",optList[entry].doff,rs[optList[entry].doff]);//D
543 } 550 }
544 else 551 else
545 { /* boolean value */ 552 { /* boolean value */
546 set_option (optList[entry].flag & Optflag_mask, flag == On); 553 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
547 554
548 if (optList[entry].doff != -1) 555 if (optList[entry].doff != -1)
549 rs[optList[entry].doff] = flag; 556 rs[optList[entry].doff] = flag;
550 } 557 }
551 } 558 }
… …
766} 773}
767 774
768const char * 775const char *
769rxvt_term::x_resource (const char *name) 776rxvt_term::x_resource (const char *name)
770{ 777{
771 XrmDatabase database = XrmGetDatabase (display->display); 778 XrmDatabase database = XrmGetDatabase (xdisp);
772 779
773 const char *p = get_res (database, rs[Rs_name], name); 780 const char *p = get_res (database, rs[Rs_name], name);
774 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 781 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
775 782
776 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 783 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
828 835
829 /* 836 /*
830 * [R5 or later]: enumerate the resource database 837 * [R5 or later]: enumerate the resource database
831 */ 838 */
832# ifdef KEYSYM_RESOURCE 839# ifdef KEYSYM_RESOURCE
833 XrmDatabase database = XrmGetDatabase (display->display); 840 XrmDatabase database = XrmGetDatabase (xdisp);
834 XrmName name_prefix[3]; 841 XrmName name_prefix[3];
835 XrmClass class_prefix[3]; 842 XrmClass class_prefix[3];
836 843
837 name_prefix[0] = XrmStringToName (rs[Rs_name]); 844 name_prefix[0] = XrmStringToName (rs[Rs_name]);
838 name_prefix[1] = XrmStringToName ("keysym"); 845 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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