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

Diff Legend

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