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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.122 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.124 by root, Wed Dec 21 14:19:19 2005 UTC

369 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
371 } 371 }
372 372
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_POSITIVE_INT16);
375 375
376#if ENABLE_FRILLS 376#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, MAX_POSITIVE_INT16);
379
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, MAX_POSITIVE_INT16);
382
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, MAX_POSITIVE_INT16);
383#endif 385#endif
384 386
385#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 389 pointerBlankDelay = i;
458 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
459 461
460#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 464 if (options & Opt_reverseVideo)
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 466#endif
465 467
466 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 469 color_aliases (Color_fg);
468 color_aliases (Color_bg); 470 color_aliases (Color_bg);
521 523
522 /* avoiding the math library: 524 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) 526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 527 ;
526 MAX_IT (i, 1); 528 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 530
529 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)parent[0]); 532 (unsigned int)parent[0]);
531 533

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines