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.186 by ayin, Sat Jun 9 09:05:38 2007 UTC vs.
Revision 1.210 by ayin, Sat Sep 8 21:25:56 2007 UTC

… …
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;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
208#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
211 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
212#endif 215#endif
213
214 last_bot = last_state = -1; 216 last_bot = last_state = -1;
215 217
216 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 222 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 223 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 224 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 225 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52); 226 set_option (Opt_iso14755_52);
… …
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292 295
293 cmd_argv[i] = NULL; 296 cmd_argv[i] = NULL;
294 } 297 }
295 298
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_basename (argv[0]);
297 300
298 /* 301 /*
299 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
300 */ 303 */
301 304
… …
316#if XFT 319#if XFT
317 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 322#endif
320 323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
321 free (r_argv); 327 free (r_argv);
322 328
323 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
324 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
325 rs [i] = 0; 331 rs [i] = 0;
… …
341 * set any defaults not already set 347 * set any defaults not already set
342 */ 348 */
343 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
344 { 350 {
345 if (!rs[Rs_title]) 351 if (!rs[Rs_title])
346 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 352 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
347 if (!rs[Rs_iconName]) 353 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_title]; 354 rs[Rs_iconName] = rs[Rs_title];
349 } 355 }
350 else 356 else
351 { 357 {
… …
396 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
397# endif 403# endif
398 else 404 else
399 { 405 {
400 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
401 rxvt_Str_trim (val);
402 rxvt_Str_escaped (val);
403 key_backspace = val; 407 key_backspace = val;
404 } 408 }
405#endif 409#endif
406 410
407#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
412 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
413# endif 417# endif
414 else 418 else
415 { 419 {
416 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
417 rxvt_Str_trim (val);
418 rxvt_Str_escaped (val);
419 key_delete = val; 421 key_delete = val;
420 } 422 }
421#endif 423#endif
422 if (rs[Rs_answerbackstring])
423 {
424 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
425 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
426 }
427 424
428#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
429 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
430#endif 427#endif
431 428
… …
476/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
477void 474void
478rxvt_term::init_env () 475rxvt_term::init_env ()
479{ 476{
480 int i; 477 int i;
481 unsigned int u;
482 char *val; 478 char *val;
483 479
484#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
485 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
486 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
501 497
502 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
503 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
504 500
505 i = strlen (val); 501 i = strlen (val);
506 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
507 503
508 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
509 505
510 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
511 507
… …
532 else 528 else
533 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
534 530
535 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
536 { 532 {
537 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 533 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
538 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
539 putenv (env_term); 535 putenv (env_term);
540 } 536 }
541 else 537 else
542 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 875rxvt_term::create_windows (int argc, const char *const *argv)
880{ 876{
881 XClassHint classHint; 877 XClassHint classHint;
882 XWMHints wmHint; 878 XWMHints wmHint;
883#if ENABLE_FRILLS 879#if ENABLE_FRILLS
884 MWMHints mwmhints; 880 MWMHints mwmhints = { };
885#endif 881#endif
886 XGCValues gcvalue; 882 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 883 XSetWindowAttributes attributes;
888 Window top, parent; 884 Window top, parent;
889 885
… …
902#if ENABLE_FRILLS 898#if ENABLE_FRILLS
903 if (option (Opt_borderLess)) 899 if (option (Opt_borderLess))
904 { 900 {
905 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 902 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 903 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908 attributes.override_redirect = true; 904 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 905 }
911 else 906 else
912 { 907 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 909 }
916 } 910 }
917 else
918 mwmhints.flags = 0;
919#endif 911#endif
920 912
921#if ENABLE_XEMBED 913#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
923 { 915 {
… …
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1026
1035 vt_select_input (); 1027 vt_select_input ();
1036 1028
1037 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1038
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041#ifndef HAVE_AFTERIMAGE
1042 && !option (Opt_transparent)
1043#endif
1044 )
1045 {
1046 const char *p = rs[Rs_backgroundPixmap];
1047
1048 if ((p = strchr (p, ';')) != NULL)
1049 {
1050 p++;
1051 scale_pixmap (p);
1052 }
1053
1054 set_bgPixmap (rs[Rs_backgroundPixmap]);
1055 scr_touch (true);
1056 }
1057#endif
1058 1030
1059 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 0; 1034 gcvalue.graphics_exposures = 0;
… …
1414 const char *argv0, *shell; 1386 const char *argv0, *shell;
1415 1387
1416 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1417 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1418 1390
1419 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_basename (shell);
1420 1392
1421 if (option (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1422 { 1394 {
1423 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1424 1396
1425 login[0] = '-'; 1397 login[0] = '-';
1426 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1427 argv0 = login; 1399 argv0 = login;
1428 } 1400 }

Diff Legend

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