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.299 by sasha, Tue Jan 15 23:21:18 2008 UTC vs.
Revision 1.307 by ayin, Tue Feb 19 10:47:03 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);
… …
225 for (int i = RS_styleCount; --i; ) 223 for (int i = RS_styleCount; --i; )
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];
228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
230 232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
234 236
… …
274 pix_colors_unfocused [i].free (this); 276 pix_colors_unfocused [i].free (this);
275#endif 277#endif
276 } 278 }
277 279
278 clear (); 280 clear ();
279 }
280 281
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 282 display->flush (); /* ideally .put should do this */
285 displays.put (display); 283 displays.put (display);
284 }
286 285
287 scr_release (); 286 scr_release ();
288 287
289 /* clear all resources */ 288 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
… …
336 if (display) 335 if (display)
337 { 336 {
338#if USE_XIM 337#if USE_XIM
339 im_ev.stop (display); 338 im_ev.stop (display);
340#endif 339#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
343#endif
344#if ENABLE_TRANSPARENCY || ENABLE_PERL 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
346#endif 343#endif
347 incr_ev.stop (); 344 incr_ev.stop ();
348 termwin_ev.stop (display); 345 termwin_ev.stop (display);
… …
467 DisplayString (display)); 464 DisplayString (display));
468 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
470} 467}
471 468
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 bgPixmap.invalidate ();
517
518#ifdef ENABLE_TRANSPARENCY
519 if (option (Opt_transparent))
520 {
521 bgPixmap.set_transparent ();
522
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
534 XSelectInput (dpy, display->root, PropertyChangeMask);
535 rootwin_ev.start (display, display->root);
536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap])
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != 0)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
562#endif
563
564 set_colorfgbg ();
565
566 init_command (cmd_argv);
567
568 free (cmd_argv);
569
570 if (pty->pty >= 0)
571 pty_ev.start (pty->pty, ev::READ);
572
573 HOOK_INVOKE ((this, HOOK_START, DT_END));
574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
585 XMapWindow (dpy, vt);
586 XMapWindow (dpy, parent[0]);
587
588 refresh_check ();
589}
590
591static struct sig_handlers 469static struct sig_handlers
592{ 470{
593 ev::sig sw_term, sw_int; 471 ev::sig sw_term, sw_int;
594 472
595 /* 473 /*
… …
647 */ 525 */
648void 526void
649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650{ 528{
651 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
652 int x, y, sb_w, flags; 530 int x, y, flags;
653 unsigned int w, h; 531 unsigned int w, h;
654 unsigned int max_width, max_height; 532 unsigned int max_width, max_height;
655 533
656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
657 szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
… …
714 max_width = MAX_COLS * fwidth; 592 max_width = MAX_COLS * fwidth;
715 max_height = MAX_ROWS * fheight; 593 max_height = MAX_ROWS * fheight;
716 594
717 szHint.base_width = szHint.base_height = 2 * int_bwidth; 595 szHint.base_width = szHint.base_height = 2 * int_bwidth;
718 596
719 sb_w = 0;
720 window_vt_x = window_vt_y = int_bwidth; 597 window_vt_x = window_vt_y = int_bwidth;
721 598
722 if (scrollBar.state) 599 if (scrollBar.state)
723 { 600 {
724 sb_w = scrollbar_TotalWidth (); 601 int sb_w = scrollBar.total_width ();
725 szHint.base_width += sb_w; 602 szHint.base_width += sb_w;
726 603
727 if (!option (Opt_scrollBar_right)) 604 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 605 window_vt_x += sb_w;
729 } 606 }
… …
752 else 629 else
753 { 630 {
754 min_it (height, max_height); 631 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 632 szHint.height = szHint.base_height + height;
756 } 633 }
757
758 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w;
760 634
761 if (recalc_x) 635 if (recalc_x)
762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763 637
764 if (recalc_y) 638 if (recalc_y)
… …
923void 797void
924rxvt_term::set_window_color (int idx, const char *color) 798rxvt_term::set_window_color (int idx, const char *color)
925{ 799{
926#ifdef XTERM_COLOR_CHANGE 800#ifdef XTERM_COLOR_CHANGE
927 rxvt_color xcol; 801 rxvt_color xcol;
928 int i;
929 802
930 if (color == NULL || *color == '\0') 803 if (color == NULL || *color == '\0')
931 return; 804 return;
932 805
933 color = strdup (color); 806 color = strdup (color);
… …
935 rs[Rs_color + idx] = color; 808 rs[Rs_color + idx] = color;
936 809
937 /* handle color aliases */ 810 /* handle color aliases */
938 if (isdigit (*color)) 811 if (isdigit (*color))
939 { 812 {
940 i = atoi (color); 813 int i = atoi (color);
941 814
942 if (i >= 8 && i <= 15) 815 if (i >= 8 && i <= 15)
943 { 816 {
944 /* bright colors */ 817 /* bright colors */
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 818 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 979
1107 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 981 {
1109 if (scrollBar.state) 982 if (scrollBar.state)
1110 { 983 scrollBar.resize ();
1111 XMoveResizeWindow (dpy, scrollBar.win,
1112 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar ();
1115 }
1116 984
1117 XMoveResizeWindow (dpy, vt, 985 XMoveResizeWindow (dpy, vt,
1118 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1119 width, height); 987 width, height);
1120 988

Diff Legend

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