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.87 by root, Wed Jan 25 22:13:47 2006 UTC vs.
Revision 1.92 by root, Tue Jan 31 19:55:05 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"),
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"),
… …
320#if TINTING 322#if TINTING
321 "tint," 323 "tint,"
322#endif 324#endif
323#if defined(USE_XIM) 325#if defined(USE_XIM)
324 "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,"
325#endif 360#endif
326 "scrollbars=" 361 "scrollbars="
327#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
328 "NONE" 363 "NONE"
329#else 364#else
… …
347# endif 382# endif
348# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
349 "xterm" 384 "xterm"
350# endif 385# endif
351#endif 386#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 "v" VERSION
387 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
388 388
389#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";
390 394
391/*{{{ usage: */ 395/*{{{ usage: */
392/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
393static void 397static void
394rxvt_usage (int type) 398rxvt_usage (int type)
… …
403 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
404 408
405 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < optList_size; i++)
406 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
407 { 411 {
408 int len = 0; 412 int len = 0;
409 413
410 if (!optList_isBool (i)) 414 if (!optList_isBool (i))
411 { 415 {
412 len = optList_strlen (i); 416 len = optList_strlen (i);
413 if (len > 0) 417 if (len > 0)
… …
481/*{{{ get command-line options before getting resources */ 485/*{{{ get command-line options before getting resources */
482void 486void
483rxvt_term::get_options (int argc, const char *const *argv) 487rxvt_term::get_options (int argc, const char *const *argv)
484{ 488{
485 int i, bad_option = 0; 489 int i, bad_option = 0;
486 static const char On[3] = "ON", Off[4] = "OFF";
487 490
488 for (i = 1; i < argc; i++) 491 for (i = 1; i < argc; i++)
489 { 492 {
490 unsigned int entry, longopt = 0; 493 unsigned int entry, longopt = 0;
491 const char *flag, *opt; 494 const char *flag, *opt;
492 495
493 opt = argv[i]; 496 opt = argv[i];
494 497
495 if (*opt == '-') 498 if (*opt == '-')
496 { 499 {
497 flag = On; 500 flag = resval_on;
501
498 if (*++opt == '-') 502 if (*++opt == '-')
499 longopt = *opt++; /* long option */ 503 longopt = *opt++; /* long option */
500 } 504 }
501 else if (*opt == '+') 505 else if (*opt == '+')
502 { 506 {
503 flag = Off; 507 flag = resval_off;
508
504 if (*++opt == '+') 509 if (*++opt == '+')
505 longopt = *opt++; /* long option */ 510 longopt = *opt++; /* long option */
506 } 511 }
507 else 512 else
508 { 513 {
… …
511 continue; 516 continue;
512 } 517 }
513 518
514 if (!strcmp (opt, "help")) 519 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 520 rxvt_usage (longopt ? 2 : 1);
521
516 if (!strcmp (opt, "h")) 522 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 523 rxvt_usage (0);
518 524
519 /* feature: always try to match long-options */ 525 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size; entry++) 526 for (entry = 0; entry < optList_size; entry++)
… …
524 break; 530 break;
525 531
526 if (entry < optList_size) 532 if (entry < optList_size)
527 { 533 {
528 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
529 flag = flag == On ? Off : On; 535 flag = flag == resval_on ? resval_off : resval_on;
530 536
531 if (optList_strlen (entry)) 537 if (optList_strlen (entry))
532 { 538 {
533 /* 539 /*
534 * special cases are handled in main.c:main () to allow 540 * special cases are handled in main.c:main () to allow
535 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
536 * default values 542 * default values
537 */ 543 */
538 544
539 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
540 rs[optList[entry].doff] = flag == On && argv[i+1] 546 rs[optList[entry].doff] = flag == resval_on && argv[i+1]
541 ? argv[++i] : 0; 547 ? argv[++i] : resval_undef;
542 } 548 }
543 else 549 else
544 { /* boolean value */ 550 { /* boolean value */
545 set_option (optList[entry].flag & Optflag_mask, flag == On); 551 set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
546 552
547 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
548 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag;
549 } 555 }
550 } 556 }

Diff Legend

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