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.182 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.213 by root, Fri Sep 14 10:15:41 2007 UTC

… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 want_refresh = 1; 191 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
… …
199 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 198 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
203 200
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
206 202
207 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1; 204 last_bot = last_state = -1;
215 205
216 set_option (Opt_scrollBar); 206 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 207 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 208 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 210 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 211 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 212 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 213 set_option (Opt_intensityStyles);
214 set_option (Opt_iso14755_52);
223 215
224 return true; 216 return true;
225} 217}
226 218
227void 219void
… …
261/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
262const char ** 254const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
264{ 256{
265 int i, r_argc; 257 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
268 259
269 /* 260 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 261 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 262 */
… …
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291 282
292 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
293 } 284 }
294 285
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
296 287
297 /* 288 /*
298 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
299 */ 290 */
300 291
… …
315#if XFT 306#if XFT
316 if (rs[Rs_depth]) 307 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 308 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 309#endif
319 310
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
320 free (r_argv); 314 free (r_argv);
321 315
322 for (int i = NUM_RESOURCES; i--; ) 316 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 317 if (rs [i] == resval_undef)
324 rs [i] = 0; 318 rs [i] = 0;
… …
340 * set any defaults not already set 334 * set any defaults not already set
341 */ 335 */
342 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
343 { 337 {
344 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
348 } 342 }
349 else 343 else
350 { 344 {
… …
388 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
389 383
390#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 388# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 390# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 391#endif
405 392
406#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 397# else
411 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 399# endif
421 if (rs[Rs_answerbackstring]) 400#endif
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426 401
427#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 404#endif
430 405
… …
475/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
476void 451void
477rxvt_term::init_env () 452rxvt_term::init_env ()
478{ 453{
479 int i; 454 int i;
480 unsigned int u;
481 char *val; 455 char *val;
482 456
483#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
500 474
501 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
503 477
504 i = strlen (val); 478 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
506 480
507 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
508 482
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 484
… …
531 else 505 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
533 507
534 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
535 { 509 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 510 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 512 putenv (env_term);
539 } 513 }
540 else 514 else
541 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
641 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
642 if (!option (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
644 618
645#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
648#endif 622#endif
649 623
650 /* add value for scrollBar */ 624 /* add value for scrollBar */
651 if (scrollBar.state) 625 if (scrollBar.state)
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
879{ 853{
880 XClassHint classHint; 854 XClassHint classHint;
881 XWMHints wmHint; 855 XWMHints wmHint;
882#if ENABLE_FRILLS 856#if ENABLE_FRILLS
883 MWMHints mwmhints; 857 MWMHints mwmhints = { };
884#endif 858#endif
885 XGCValues gcvalue; 859 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
887 Window top, parent; 861 Window top, parent;
888 862
… …
901#if ENABLE_FRILLS 875#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 876 if (option (Opt_borderLess))
903 { 877 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 879 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 880 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 881 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 882 }
910 else 883 else
911 { 884 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 886 }
915 } 887 }
916 else
917 mwmhints.flags = 0;
918#endif 888#endif
919 889
920#if ENABLE_XEMBED 890#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
922 { 892 {
… …
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1003
1034 vt_select_input (); 1004 vt_select_input ();
1035 1005
1036 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !option (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054 1007
1055 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 0; 1011 gcvalue.graphics_exposures = 0;
… …
1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1276 1229
1277 int er; 1230 int er;
1278 1231
1279#ifndef NO_BACKSPACE_KEY 1232#ifndef NO_BACKSPACE_KEY
1280 if (key_backspace[0] && !key_backspace[1]) 1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1281 er = key_backspace[0]; 1234 er = rs[Rs_backspace_key][0];
1282 else if (strcmp (key_backspace, "DEC") == 0) 1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1283 er = '\177'; /* the initial state anyway */ 1236 er = '\177'; /* the initial state anyway */
1284 else 1237 else
1285#endif 1238#endif
1286 er = -1; 1239 er = -1;
1287 1240
… …
1391 sigset_t ss; 1344 sigset_t ss;
1392 sigemptyset (&ss); 1345 sigemptyset (&ss);
1393 sigprocmask (SIG_SETMASK, &ss, 0); 1346 sigprocmask (SIG_SETMASK, &ss, 0);
1394 1347
1395 /* command interpreter path */ 1348 /* command interpreter path */
1396 if (argv != NULL) 1349 if (argv)
1397 { 1350 {
1398# ifdef DEBUG_CMD 1351# ifdef DEBUG_CMD
1399 int i; 1352 int i;
1400 1353
1401 for (i = 0; argv[i]; i++) 1354 for (i = 0; argv[i]; i++)
… …
1410 const char *argv0, *shell; 1363 const char *argv0, *shell;
1411 1364
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1414 1367
1415 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1416 1369
1417 if (option (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1418 { 1371 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1420 1373
1421 login[0] = '-'; 1374 login[0] = '-';
1422 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1423 argv0 = login; 1376 argv0 = login;
1424 } 1377 }
1425 1378
1426 execlp (shell, argv0, NULL); 1379 execlp (shell, argv0, (char *)0);
1427 /* no error message: STDERR is closed! */ 1380 /* no error message: STDERR is closed! */
1428 } 1381 }
1429 1382
1430 return -1; 1383 return -1;
1431} 1384}

Diff Legend

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