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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
234 236
235#ifdef USE_XIM 237#ifdef USE_XIM
236 im_destroy (); 238 im_destroy ();
237#endif 239#endif
238#ifdef XTERM_SCROLLBAR 240 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 241 if (gc) XFreeGC (dpy, gc);
263 242
264 delete drawable; 243 delete drawable;
265 // destroy all windows 244 // destroy all windows
266 if (parent[0]) 245 if (parent[0])
… …
274 pix_colors_unfocused [i].free (this); 253 pix_colors_unfocused [i].free (this);
275#endif 254#endif
276 } 255 }
277 256
278 clear (); 257 clear ();
279 }
280 258
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 259 display->flush (); /* ideally .put should do this */
285 displays.put (display); 260 displays.put (display);
261 }
286 262
287 scr_release (); 263 scr_release ();
288 264
289 /* clear all resources */ 265 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 266 for (int i = 0; i < allocated.size (); i++)
… …
336 if (display) 312 if (display)
337 { 313 {
338#if USE_XIM 314#if USE_XIM
339 im_ev.stop (display); 315 im_ev.stop (display);
340#endif 316#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
343#endif
344#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
346#endif 320#endif
347 incr_ev.stop (); 321 incr_ev.stop ();
348 termwin_ev.stop (display); 322 termwin_ev.stop (display);
… …
467 DisplayString (display)); 441 DisplayString (display));
468 rxvt_emergency_cleanup (); 442 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 443 _exit (EXIT_FAILURE);
470} 444}
471 445
472/*----------------------------------------------------------------------*/
473void
474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{
476 this->envv = envv;
477
478 SET_R (this);
479 set_locale ("");
480 set_environ (envv); // few things in X do not call setlocale :(
481
482 init_vars ();
483
484 init_secondary ();
485
486 const char **cmd_argv = init_resources (argc, argv);
487
488#ifdef KEYSYM_RESOURCE
489 keyboard->register_done ();
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
517#ifdef ENABLE_TRANSPARENCY
518 if (option (Opt_transparent))
519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586
587 refresh_check ();
588}
589
590static struct sig_handlers 446static struct sig_handlers
591{ 447{
592 ev::sig sw_term, sw_int; 448 ev::sig sw_term, sw_int;
593 449
594 /* 450 /*
… …
646 */ 502 */
647void 503void
648rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 504rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
649{ 505{
650 short recalc_x, recalc_y; 506 short recalc_x, recalc_y;
651 int x, y, sb_w, flags; 507 int x, y, flags;
652 unsigned int w, h; 508 unsigned int w, h;
653 unsigned int max_width, max_height; 509 unsigned int max_width, max_height;
654 510
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 511 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 512 szHint.win_gravity = NorthWestGravity;
… …
703 szHint.win_gravity = SouthEastGravity; 559 szHint.win_gravity = SouthEastGravity;
704 else 560 else
705 szHint.win_gravity = SouthWestGravity; 561 szHint.win_gravity = SouthWestGravity;
706 } 562 }
707 } 563 }
564
565 if (!szHint.width || !szHint.height)
566 rxvt_fatal ("window width or height must not be zero, aborting.\n");
708 } 567 }
709 568
710 /* TODO: BOUNDS */ 569 /* TODO: BOUNDS */
711 width = ncol * fwidth; 570 width = ncol * fwidth;
712 height = nrow * fheight; 571 height = nrow * fheight;
713 max_width = MAX_COLS * fwidth; 572 max_width = MAX_COLS * fwidth;
714 max_height = MAX_ROWS * fheight; 573 max_height = MAX_ROWS * fheight;
715 574
716 szHint.base_width = szHint.base_height = 2 * int_bwidth; 575 szHint.base_width = szHint.base_height = 2 * int_bwidth;
717 576
718 sb_w = 0;
719 window_vt_x = window_vt_y = int_bwidth; 577 window_vt_x = window_vt_y = int_bwidth;
720 578
721 if (scrollBar.state) 579 if (scrollBar.state)
722 { 580 {
723 sb_w = scrollbar_TotalWidth (); 581 int sb_w = scrollBar.total_width ();
724 szHint.base_width += sb_w; 582 szHint.base_width += sb_w;
725 583
726 if (!option (Opt_scrollBar_right)) 584 if (!option (Opt_scrollBar_right))
727 window_vt_x += sb_w; 585 window_vt_x += sb_w;
728 } 586 }
… …
751 else 609 else
752 { 610 {
753 min_it (height, max_height); 611 min_it (height, max_height);
754 szHint.height = szHint.base_height + height; 612 szHint.height = szHint.base_height + height;
755 } 613 }
756
757 if (scrollBar.state && option (Opt_scrollBar_right))
758 window_sb_x = szHint.width - sb_w;
759 614
760 if (recalc_x) 615 if (recalc_x)
761 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 616 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
762 617
763 if (recalc_y) 618 if (recalc_y)
… …
922void 777void
923rxvt_term::set_window_color (int idx, const char *color) 778rxvt_term::set_window_color (int idx, const char *color)
924{ 779{
925#ifdef XTERM_COLOR_CHANGE 780#ifdef XTERM_COLOR_CHANGE
926 rxvt_color xcol; 781 rxvt_color xcol;
927 int i;
928 782
929 if (color == NULL || *color == '\0') 783 if (color == NULL || *color == '\0')
930 return; 784 return;
931 785
932 color = strdup (color); 786 color = strdup (color);
… …
934 rs[Rs_color + idx] = color; 788 rs[Rs_color + idx] = color;
935 789
936 /* handle color aliases */ 790 /* handle color aliases */
937 if (isdigit (*color)) 791 if (isdigit (*color))
938 { 792 {
939 i = atoi (color); 793 int i = atoi (color);
940 794
941 if (i >= 8 && i <= 15) 795 if (i >= 8 && i <= 15)
942 { 796 {
943 /* bright colors */ 797 /* bright colors */
944 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 798 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1104 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 958 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1105 959
1106 if (fix_screen || newwidth != old_width || newheight != old_height) 960 if (fix_screen || newwidth != old_width || newheight != old_height)
1107 { 961 {
1108 if (scrollBar.state) 962 if (scrollBar.state)
1109 { 963 scrollBar.resize ();
1110 XMoveResizeWindow (dpy, scrollBar.win,
1111 window_sb_x, 0,
1112 scrollbar_TotalWidth (), szHint.height);
1113 resize_scrollbar ();
1114 }
1115 964
1116 XMoveResizeWindow (dpy, vt, 965 XMoveResizeWindow (dpy, vt,
1117 window_vt_x, window_vt_y, 966 window_vt_x, window_vt_y,
1118 width, height); 967 width, height);
1119 968

Diff Legend

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