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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.21 by pcg, Thu Jan 29 23:26:01 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.14 2003/12/18 00:29:29 pcg Exp $ 4 * $Id: main.C,v 1.21 2004/01/29 23:26:01 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
… …
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
63: pty_ev (this, &rxvt_term::pty_cb), 77: destroy_ev (this, &rxvt_term::destroy_cb),
64#ifdef CURSOR_BLINK 78#ifdef CURSOR_BLINK
79 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
80#endif
81#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 82 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 83#endif
67#ifdef POINTER_BLANK 84#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 85 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 86#endif
70 x_ev (this, &rxvt_term::x_cb), 87 x_ev (this, &rxvt_term::x_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb), 88 check_ev (this, &rxvt_term::check_cb),
73 incr_ev (this, &rxvt_term::incr_cb) 89 incr_ev (this, &rxvt_term::incr_cb),
90 pty_ev (this, &rxvt_term::pty_cb)
74{ 91{
75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
76} 93}
77 94
78rxvt_term::~rxvt_term () 95rxvt_term::~rxvt_term ()
79{ 96{
80 scr_release (); 97 scr_release ();
81 98
82#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
83 free (locale); 99 free (locale);
84#endif 100 free (codeset);
101
85#ifndef NO_SETOWNER_TTYDEV 102#ifndef NO_SETOWNER_TTYDEV
86 rxvt_privileged_ttydev (this, RESTORE); 103 rxvt_privileged_ttydev (this, RESTORE);
87#endif 104#endif
88#ifdef UTMP_SUPPORT 105#ifdef UTMP_SUPPORT
89 rxvt_privileged_utmp (this, RESTORE); 106 rxvt_privileged_utmp (this, RESTORE);
… …
110{ 127{
111 check_ev.stop (); 128 check_ev.stop ();
112 pty_ev.stop (); 129 pty_ev.stop ();
113 x_ev.stop (); 130 x_ev.stop ();
114#ifdef CURSOR_BLINK 131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
115 blink_ev.stop (); 135 text_blink_ev.stop ();
116#endif 136#endif
117#ifdef POINTER_BLANK 137#ifdef POINTER_BLANK
118 pointer_ev.stop (); 138 pointer_ev.stop ();
119#endif 139#endif
120 140
… …
178} 198}
179 199
180bool 200bool
181rxvt_term::init (int argc, const char *const *argv) 201rxvt_term::init (int argc, const char *const *argv)
182{ 202{
183 dR;//TODO (scrollbar, setidle)
184
185 /* 203 /*
186 * Save and then give up any super-user privileges 204 * Save and then give up any super-user privileges
187 * If we need privileges in any area then we must specifically request it. 205 * If we need privileges in any area then we must specifically request it.
188 * We should only need to be root in these cases: 206 * We should only need to be root in these cases:
189 * 1. write utmp entries on some systems 207 * 1. write utmp entries on some systems
190 * 2. chown tty on some systems 208 * 2. chown tty on some systems
191 */ 209 */
192 rxvt_privileges (this, SAVE); 210 rxvt_privileges (this, SAVE);
193 rxvt_privileges (this, IGNORE); 211 rxvt_privileges (this, IGNORE);
194 212
195 rxvt_init_secondary (this); 213 init_secondary ();
196 214
197 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 215 const char **cmd_argv = init_resources (argc, argv);
216
217 set_locale ("");
198 218
199#if (MENUBAR_MAX) 219#if (MENUBAR_MAX)
200 rxvt_menubar_read (this, rs[Rs_menu]); 220 rxvt_menubar_read (this, rs[Rs_menu]);
201#endif 221#endif
202#ifdef HAVE_SCROLLBARS 222#ifdef HAVE_SCROLLBARS
203 if (Options & Opt_scrollBar) 223 if (Options & Opt_scrollBar)
204 scrollbar_setIdle (); /* set existence for size calculations */ 224 scrollBar.setIdle (); /* set existence for size calculations */
205#endif 225#endif
206 226
207 rxvt_Create_Windows (this, argc, argv); 227 create_windows (argc, argv);
208 228
209 rxvt_init_xlocale (this); 229 init_xlocale ();
210 230
211 scr_reset (); /* initialize screen */ 231 scr_reset (); /* initialize screen */
212#ifdef RXVT_GRAPHICS 232#ifdef RXVT_GRAPHICS
213 rxvt_Gr_reset (this); /* reset graphics */ 233 rxvt_Gr_reset (this); /* reset graphics */
214#endif 234#endif
… …
219#endif 239#endif
220#endif 240#endif
221 241
222#ifdef HAVE_SCROLLBARS 242#ifdef HAVE_SCROLLBARS
223 if (Options & Opt_scrollBar) 243 if (Options & Opt_scrollBar)
224 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 244 resize_scrollbar (); /* create and map scrollbar */
225#endif 245#endif
226#if (MENUBAR_MAX) 246#if (MENUBAR_MAX)
227 if (menubar_visible(r)) 247 if (menubar_visible(r))
228 XMapWindow (Xdisplay, menuBar.win); 248 XMapWindow (Xdisplay, menuBar.win);
229#endif 249#endif
… …
235 } 255 }
236#endif 256#endif
237 XMapWindow (Xdisplay, TermWin.vt); 257 XMapWindow (Xdisplay, TermWin.vt);
238 XMapWindow (Xdisplay, TermWin.parent[0]); 258 XMapWindow (Xdisplay, TermWin.parent[0]);
239 259
240 rxvt_init_env (this); 260 init_env ();
241 rxvt_init_command (this, cmd_argv); 261 init_command (cmd_argv);
242 262
243 x_ev.start (Xfd, EVENT_READ); 263 x_ev.start (Xfd, EVENT_READ);
244 pty_ev.start (cmd_fd, EVENT_READ); 264 pty_ev.start (cmd_fd, EVENT_READ);
245 265
246 check_ev.start (); 266 check_ev.start ();
… …
507/*----------------------------------------------------------------------*/ 527/*----------------------------------------------------------------------*/
508/* 528/*
509 * window size/position calculcations for XSizeHint and other storage. 529 * window size/position calculcations for XSizeHint and other storage.
510 * if width/height are non-zero then override calculated width/height 530 * if width/height are non-zero then override calculated width/height
511 */ 531 */
512/* EXTPROTO */
513void 532void
514rxvt_window_calc(pR_ unsigned int width, unsigned int height) 533rxvt_term::window_calc (unsigned int width, unsigned int height)
515{ 534{
516 short recalc_x, recalc_y; 535 short recalc_x, recalc_y;
517 int x, y, sb_w, mb_h, flags; 536 int x, y, sb_w, mb_h, flags;
518 unsigned int w, h; 537 unsigned int w, h;
519 unsigned int max_width, max_height; 538 unsigned int max_width, max_height;
520 539
521 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
522 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 541 TermWin.ncol, TermWin.nrow, szHint.width,
523 R->szHint.height)); 542 szHint.height));
524 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 543 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
525 R->szHint.win_gravity = NorthWestGravity; 544 szHint.win_gravity = NorthWestGravity;
526/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 545/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
527 546
528 recalc_x = recalc_y = 0; 547 recalc_x = recalc_y = 0;
529 flags = 0; 548 flags = 0;
530 if (!R->parsed_geometry) { 549 if (!parsed_geometry) {
531 R->parsed_geometry = 1; 550 parsed_geometry = 1;
532 if (R->rs[Rs_geometry]) 551 if (rs[Rs_geometry])
533 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 552 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
534 if (flags & WidthValue) { 553 if (flags & WidthValue) {
535 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 554 TermWin.ncol = BOUND_POSITIVE_INT16(w);
536 R->szHint.flags |= USSize; 555 szHint.flags |= USSize;
537 } 556 }
538 if (flags & HeightValue) { 557 if (flags & HeightValue) {
539 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 558 TermWin.nrow = BOUND_POSITIVE_INT16(h);
540 R->szHint.flags |= USSize; 559 szHint.flags |= USSize;
541 } 560 }
542 if (flags & XValue) { 561 if (flags & XValue) {
543 R->szHint.x = x; 562 szHint.x = x;
544 R->szHint.flags |= USPosition; 563 szHint.flags |= USPosition;
545 if (flags & XNegative) { 564 if (flags & XNegative) {
546 recalc_x = 1; 565 recalc_x = 1;
547 R->szHint.win_gravity = NorthEastGravity; 566 szHint.win_gravity = NorthEastGravity;
548 } 567 }
549 } 568 }
550 if (flags & YValue) { 569 if (flags & YValue) {
551 R->szHint.y = y; 570 szHint.y = y;
552 R->szHint.flags |= USPosition; 571 szHint.flags |= USPosition;
553 if (flags & YNegative) { 572 if (flags & YNegative) {
554 recalc_y = 1; 573 recalc_y = 1;
555 if (R->szHint.win_gravity == NorthEastGravity) 574 if (szHint.win_gravity == NorthEastGravity)
556 R->szHint.win_gravity = SouthEastGravity; 575 szHint.win_gravity = SouthEastGravity;
557 else 576 else
558 R->szHint.win_gravity = SouthWestGravity; 577 szHint.win_gravity = SouthWestGravity;
559 } 578 }
560 } 579 }
561 } 580 }
562/* TODO: BOUNDS */ 581/* TODO: BOUNDS */
563 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 582 TermWin.width = TermWin.ncol * TermWin.fwidth;
564 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 583 TermWin.height = TermWin.nrow * TermWin.fheight;
565 max_width = MAX_COLS * R->TermWin.fwidth; 584 max_width = MAX_COLS * TermWin.fwidth;
566 max_height = MAX_ROWS * R->TermWin.fheight; 585 max_height = MAX_ROWS * TermWin.fheight;
567 586
568 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
569 588
570 sb_w = mb_h = 0; 589 sb_w = mb_h = 0;
571 R->window_vt_x = R->window_vt_y = 0; 590 window_vt_x = window_vt_y = 0;
572 if (scrollbar_visible(R)) { 591 if (scrollbar_visible (this)) {
573 sb_w = scrollbar_TotalWidth(); 592 sb_w = scrollbar_TotalWidth();
574 R->szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
575 if (!(R->Options & Opt_scrollBar_right)) 594 if (!(Options & Opt_scrollBar_right))
576 R->window_vt_x = sb_w; 595 window_vt_x = sb_w;
577 } 596 }
578 if (menubar_visible(R)) { 597 if (menubar_visible (this)) {
579 mb_h = menuBar_TotalHeight(); 598 mb_h = menuBar_TotalHeight();
580 R->szHint.base_height += mb_h; 599 szHint.base_height += mb_h;
581 R->window_vt_y = mb_h; 600 window_vt_y = mb_h;
582 } 601 }
583 R->szHint.width_inc = R->TermWin.fwidth; 602 szHint.width_inc = TermWin.fwidth;
584 R->szHint.height_inc = R->TermWin.fheight; 603 szHint.height_inc = TermWin.fheight;
585 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 604 szHint.min_width = szHint.base_width + szHint.width_inc;
586 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 605 szHint.min_height = szHint.base_height + szHint.height_inc;
587 606
588 if (width && width - R->szHint.base_width < max_width) { 607 if (width && width - szHint.base_width < max_width) {
589 R->szHint.width = width; 608 szHint.width = width;
590 R->TermWin.width = width - R->szHint.base_width; 609 TermWin.width = width - szHint.base_width;
591 } else { 610 } else {
592 MIN_IT(R->TermWin.width, max_width); 611 MIN_IT(TermWin.width, max_width);
593 R->szHint.width = R->szHint.base_width + R->TermWin.width; 612 szHint.width = szHint.base_width + TermWin.width;
594 } 613 }
595 if (height && height - R->szHint.base_height < max_height) { 614 if (height && height - szHint.base_height < max_height) {
596 R->szHint.height = height; 615 szHint.height = height;
597 R->TermWin.height = height - R->szHint.base_height; 616 TermWin.height = height - szHint.base_height;
598 } else { 617 } else {
599 MIN_IT(R->TermWin.height, max_height); 618 MIN_IT(TermWin.height, max_height);
600 R->szHint.height = R->szHint.base_height + R->TermWin.height; 619 szHint.height = szHint.base_height + TermWin.height;
601 } 620 }
602 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 621 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right))
603 R->window_sb_x = R->szHint.width - sb_w; 622 window_sb_x = szHint.width - sb_w;
604 623
605 if (recalc_x) 624 if (recalc_x)
606 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 625 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
607 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 626 - szHint.width - 2 * TermWin.ext_bwidth);
608 if (recalc_y) 627 if (recalc_y)
609 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 628 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
610 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 629 - szHint.height - 2 * TermWin.ext_bwidth);
611 630
612 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 631 TermWin.ncol = TermWin.width / TermWin.fwidth;
613 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 632 TermWin.nrow = TermWin.height / TermWin.fheight;
614 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
615 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 634 TermWin.ncol, TermWin.nrow, szHint.width,
616 R->szHint.height)); 635 szHint.height));
617 return; 636 return;
618} 637}
619 638
620/*----------------------------------------------------------------------*/ 639/*----------------------------------------------------------------------*/
621/* 640/*
… …
623 * Called after a window size change. 642 * Called after a window size change.
624 */ 643 */
625void 644void
626rxvt_term::tt_winch () 645rxvt_term::tt_winch ()
627{ 646{
628 struct winsize ws; 647 struct winsize ws;
629 648
630 if (cmd_fd < 0) 649 if (cmd_fd < 0)
631 return; 650 return;
632 651
633 ws.ws_col = TermWin.ncol; 652 ws.ws_col = TermWin.ncol;
… …
761 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
762 R->PixColors[Color_bg]); 781 R->PixColors[Color_bg]);
763 782
764/* handle Color_BD, scrollbar background, etc. */ 783/* handle Color_BD, scrollbar background, etc. */
765 784
766 rxvt_set_colorfgbg(aR); 785 rxvt_set_colorfgbg (aR);
767 rxvt_recolour_cursor(aR); 786 R->recolour_cursor ();
768/* the only reasonable way to enforce a clean update */ 787/* the only reasonable way to enforce a clean update */
769 rxvt_scr_poweron(aR); 788 rxvt_scr_poweron (aR);
770} 789}
771 790
772#else 791#else
773# define rxvt_set_window_color(aR_ idx,color) ((void)0) 792# define rxvt_set_window_color(aR_ idx,color) ((void)0)
774#endif /* XTERM_COLOR_CHANGE */ 793#endif /* XTERM_COLOR_CHANGE */
775 794
776/* EXTPROTO */
777void 795void
778rxvt_recolour_cursor(pR) 796rxvt_term::recolour_cursor ()
779{ 797{
780 rxvt_color xcol[2];
781
782#if TODO 798#if TODO
799 rxvt_color xcol[2];
800
783 xcol[0] = R->PixColors[Color_pointer]; 801 xcol[0] = PixColors[Color_pointer];
784 xcol[1] = R->PixColors[Color_bg]; 802 xcol[1] = PixColors[Color_bg];
785 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 803 XQueryColors (Xdisplay, XCMAP, xcol, 2);
786 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 804 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
787#endif 805#endif
788} 806}
789 807
790/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
791/* 809/*
… …
851} 869}
852 870
853/* -------------------------------------------------------------------- * 871/* -------------------------------------------------------------------- *
854 * - WINDOW RESIZING - * 872 * - WINDOW RESIZING - *
855 * -------------------------------------------------------------------- */ 873 * -------------------------------------------------------------------- */
856/* EXTPROTO */
857void 874void
858rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 875rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
859 int ignoreparent)
860{ 876{
861 int fix_screen; 877 int fix_screen;
862 878
863#ifdef SMART_RESIZE 879#ifdef SMART_RESIZE
864 int old_width = R->szHint.width, old_height = R->szHint.height; 880 int old_width = szHint.width, old_height = szHint.height;
865#endif 881#endif
866 882
867 rxvt_window_calc(aR_ width, height); 883 window_calc (width, height);
868 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 884 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
869 if (!ignoreparent) { 885 if (!ignoreparent)
886 {
870#ifdef SMART_RESIZE 887#ifdef SMART_RESIZE
871/* 888 /*
872 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 889 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
873 * reposition window on resize depending on placement on screen 890 * reposition window on resize depending on placement on screen
874 */ 891 */
875 int x, y, x1, y1; 892 int x, y, x1, y1;
876 int dx, dy; 893 int dx, dy;
877 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 894 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
878 Window unused_cr; 895 Window unused_cr;
879 896
880 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 897 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
881 0, 0, &x, &y, &unused_cr); 898 0, 0, &x, &y, &unused_cr);
882 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 899 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
883 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 900 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
884 /* 901 /*
885 * if Xroot isn't the parent window, a WM will probably have offset 902 * if Xroot isn't the parent window, a WM will probably have offset
886 * our position for handles and decorations. Counter it 903 * our position for handles and decorations. Counter it
887 */ 904 */
888 if (x1 != x || y1 != y) { 905 if (x1 != x || y1 != y) {
889 x -= x1; 906 x -= x1;
890 y -= y1; 907 y -= y1;
908 }
909
910 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
911 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
912 dx = old_width - szHint.width;
913 dy = old_height - szHint.height;
914
915 /* Check position of the center of the window */
916 if (x < x1) /* left half */
917 dx = 0;
918 else if (x == x1) /* exact center */
919 dx /= 2;
920 if (y < y1) /* top half */
921 dy = 0;
922 else if (y == y1) /* exact center */
923 dy /= 2;
924
925 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
926 szHint.width, szHint.height);
927#else
928 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
929 szHint.height);
930#endif
931 }
932
933 fix_screen = (TermWin.ncol != prev_ncol
934 || TermWin.nrow != prev_nrow);
935
936 if (fix_screen || width != old_width || height != old_height)
937 {
938 if (scrollbar_visible (this))
939 {
940 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
941 0, scrollbar_TotalWidth (), szHint.height);
942 resize_scrollbar ();
891 } 943 }
892 944
893 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 945 if (menubar_visible (this))
894 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 946 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
895 dx = old_width - R->szHint.width; 947 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
896 dy = old_height - R->szHint.height;
897 948
898 /* Check position of the center of the window */ 949 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
899 if (x < x1) /* left half */ 950 window_vt_y, TermWin_TotalWidth (),
900 dx = 0; 951 TermWin_TotalHeight ());
901 else if (x == x1) /* exact center */ 952#ifdef RXVT_GRAPHICS
902 dx /= 2; 953 if (old_height)
903 if (y < y1) /* top half */ 954 rxvt_Gr_Resize (this, old_width - szHint.base_width,
904 dy = 0;
905 else if (y == y1) /* exact center */
906 dy /= 2;
907
908 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
909 R->szHint.width, R->szHint.height);
910#else
911 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
912 R->szHint.height); 955 old_height - szHint.base_height);
913#endif 956#endif
957 scr_clear ();
958#ifdef XPM_BACKGROUND
959 rxvt_resize_pixmap (this);
960#endif
961 }
962
963 if (fix_screen || old_height == 0)
914 } 964 {
965 int curr_screen = -1;
966 int old_ncol = prev_ncol;
915 967
916 fix_screen = (R->TermWin.ncol != R->prev_ncol 968 /* scr_reset only works on the primary screen */
917 || R->TermWin.nrow != R->prev_nrow); 969 if (old_height) /* this is not the first time through */
918 if (fix_screen || width != R->old_width || height != R->old_height) { 970 {
919 if (scrollbar_visible(R)) { 971 unsigned int ncol = TermWin.ncol;
920 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 972 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
921 0, scrollbar_TotalWidth(), R->szHint.height); 973 curr_screen = rxvt_scr_change_screen (this, PRIMARY);
922 rxvt_Resize_scrollBar(aR); 974 TermWin.ncol = ncol;
923 } 975 }
924 if (menubar_visible(R))
925 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
926 0, TermWin_TotalWidth(), menuBar_TotalHeight());
927 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
928 R->window_vt_y, TermWin_TotalWidth(),
929 TermWin_TotalHeight());
930#ifdef RXVT_GRAPHICS
931 if (R->old_height)
932 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
933 R->old_height - R->szHint.base_height);
934#endif
935 rxvt_scr_clear(aR);
936#ifdef XPM_BACKGROUND
937 rxvt_resize_pixmap(aR);
938#endif
939 }
940 976
941 if (fix_screen || R->old_height == 0) {
942 int curr_screen = -1;
943 uint16_t old_ncol = R->prev_ncol;
944
945 /* scr_reset only works on the primary screen */
946 if (R->old_height) /* this is not the first time through */
947 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
948
949 R->scr_reset(); 977 scr_reset();
950 978
951 if (curr_screen >= 0) { /* this is not the first time through */ 979 if (curr_screen >= 0) /* this is not the first time through */
980 {
952 rxvt_scr_change_screen(aR_ curr_screen); 981 rxvt_scr_change_screen (this, curr_screen);
953 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 982 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0);
954 } 983 }
955 } 984 }
956 985
957 R->old_width = R->szHint.width; 986 old_width = szHint.width;
958 R->old_height = R->szHint.height; 987 old_height = szHint.height;
959 988
960#ifdef USE_XIM 989#ifdef USE_XIM
961 rxvt_IMSetStatusPosition(aR); 990 rxvt_IMSetStatusPosition (this);
962#endif 991#endif
963} 992}
964 993
965/* 994/*
966 * Set the width/height of the vt window in characters. Units are pixels. 995 * Set the width/height of the vt window in characters. Units are pixels.
… …
980 height = wattr.height - R->szHint.base_height; 1009 height = wattr.height - R->szHint.base_height;
981 } 1010 }
982 if (width != R->TermWin.width || height != R->TermWin.height) { 1011 if (width != R->TermWin.width || height != R->TermWin.height) {
983 width += R->szHint.base_width; 1012 width += R->szHint.base_width;
984 height += R->szHint.base_height; 1013 height += R->szHint.base_height;
985 rxvt_resize_all_windows(aR_ width, height, 0); 1014 R->resize_all_windows (width, height, 0);
986 } 1015 }
987} 1016}
988 1017
989/* -------------------------------------------------------------------- * 1018/* -------------------------------------------------------------------- *
990 * - X INPUT METHOD ROUTINES - * 1019 * - X INPUT METHOD ROUTINES - *
991 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
992#ifdef USE_XIM 1021#ifdef USE_XIM
993/* INTPROTO */
994void 1022void
995rxvt_setSize(pR_ XRectangle * size) 1023rxvt_term::set_size (XRectangle *size)
996{ 1024{
997 size->x = R->TermWin.int_bwidth; 1025 size->x = TermWin.int_bwidth;
998 size->y = R->TermWin.int_bwidth; 1026 size->y = TermWin.int_bwidth;
999 size->width = Width2Pixel(R->TermWin.ncol); 1027 size->width = Width2Pixel(TermWin.ncol);
1000 size->height = Height2Pixel(R->TermWin.nrow); 1028 size->height = Height2Pixel(TermWin.nrow);
1001} 1029}
1002 1030
1003/* INTPROTO */
1004void 1031void
1005rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1032rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
1006{ 1033{
1007 *fg = R->PixColors[Color_fg]; 1034 *fg = PixColors[Color_fg];
1008 *bg = R->PixColors[Color_bg]; 1035 *bg = PixColors[Color_bg];
1009} 1036}
1010 1037
1011/* Checking whether input method is running. */ 1038/* Checking whether input method is running. */
1012/* INTPROTO */ 1039/* INTPROTO */
1013Bool 1040Bool
… …
1048 || R->event_type == SelectionNotify 1075 || R->event_type == SelectionNotify
1049 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1076 || R->event_type == ButtonRelease || R->event_type == FocusIn)
1050 || !rxvt_IMisRunning(aR)) 1077 || !rxvt_IMisRunning(aR))
1051 return; 1078 return;
1052 1079
1053 rxvt_setPosition(aR_ & spot); 1080 R->set_position (&spot);
1054 1081
1055 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1082 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1056 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1083 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1057 XFree(preedit_attr); 1084 XFree(preedit_attr);
1058} 1085}
1059 1086
1060/* EXTPROTO */
1061void 1087void
1062rxvt_setTermFontSet(pR_ int idx)
1063{
1064 char *string;
1065 long length;
1066 int success = 0;
1067
1068 if (idx < 0 || idx >= MAX_NFONTS)
1069 return;
1070}
1071
1072/* INTPROTO */
1073void
1074rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1088rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1075 XRectangle * needed_rect) 1089 XRectangle * needed_rect)
1076{ 1090{
1077 int mbh, vtx = 0; 1091 int mbh, vtx = 0;
1078 1092
1079 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1093 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right))
1080 vtx = scrollbar_TotalWidth(); 1094 vtx = scrollbar_TotalWidth();
1095
1081 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1096 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0;
1082 mbh -= R->TermWin.lineSpace; 1097 mbh -= TermWin.lineSpace;
1083 1098
1084 preedit_rect->x = needed_rect->width + vtx; 1099 preedit_rect->x = needed_rect->width + vtx;
1085 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1100 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1086 1101
1087 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1102 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1088 + vtx;
1089 preedit_rect->height = Height2Pixel(1); 1103 preedit_rect->height = Height2Pixel(1);
1090 1104
1091 status_rect->x = vtx; 1105 status_rect->x = vtx;
1092 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1106 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1093 1107
1094 status_rect->width = needed_rect->width ? needed_rect->width 1108 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1095 : Width2Pixel(R->TermWin.ncol + 1);
1096 status_rect->height = Height2Pixel(1); 1109 status_rect->height = Height2Pixel(1);
1097} 1110}
1098 1111
1099/* ARGSUSED */ 1112/* ARGSUSED */
1100/* INTPROTO */ 1113/* INTPROTO */
1101void 1114void
… …
1108 R->Input_Context = NULL; 1121 R->Input_Context = NULL;
1109/* To avoid Segmentation Fault in C locale: Solaris only? */ 1122/* To avoid Segmentation Fault in C locale: Solaris only? */
1110 if (STRCMP(R->locale, "C")) 1123 if (STRCMP(R->locale, "C"))
1111 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1124 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1112 rxvt_IMInstantiateCallback, NULL); 1125 rxvt_IMInstantiateCallback, NULL);
1126}
1127
1128/*
1129 * Try to open a XIM with the current modifiers, then see if we can
1130 * open a suitable preedit type
1131 */
1132static Bool
1133rxvt_IM_get_IC (pR)
1134{
1135 int i, j, found;
1136 XIM xim;
1137 XPoint spot;
1138 XRectangle rect, status_rect, needed_rect;
1139 unsigned long fg, bg;
1140 const char *p;
1141 char **s;
1142 XIMStyles *xim_styles;
1143 XVaNestedList preedit_attr, status_attr;
1144 XIMCallback ximcallback;
1145
1146 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1147 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1148 if (xim == NULL)
1149 return False;
1150
1151 xim_styles = NULL;
1152 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1153 || !xim_styles || !xim_styles->count_styles) {
1154 XCloseIM(xim);
1155 return False;
1156 }
1157
1158 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1159 : "OverTheSpot,OffTheSpot,Root";
1160 s = rxvt_splitcommastring(p);
1161 for (i = found = 0; !found && s[i]; i++) {
1162 if (!STRCMP(s[i], "OverTheSpot"))
1163 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1164 else if (!STRCMP(s[i], "OffTheSpot"))
1165 R->input_style = (XIMPreeditArea | XIMStatusArea);
1166 else if (!STRCMP(s[i], "Root"))
1167 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1168
1169 for (j = 0; j < xim_styles->count_styles; j++)
1170 if (R->input_style == xim_styles->supported_styles[j]) {
1171 found = 1;
1172 break;
1173 }
1174 }
1175 for (i = 0; s[i]; i++)
1176 free(s[i]);
1177 free(s);
1178 XFree(xim_styles);
1179
1180 if (!found) {
1181 XCloseIM(xim);
1182 return False;
1183 }
1184
1185 ximcallback.callback = rxvt_IMDestroyCallback;
1186
1187 /* XXX: not sure why we need this (as well as IC one below) */
1188 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1189
1190 preedit_attr = status_attr = NULL;
1191
1192 if (R->input_style & XIMPreeditPosition) {
1193 R->set_size (&rect);
1194 R->set_position (&spot);
1195 R->set_color (&fg, &bg);
1196
1197 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1198 XNSpotLocation, &spot,
1199 XNForeground, fg, XNBackground, bg,
1200 //XNFontSet, R->TermWin.fontset,
1201 NULL);
1202 } else if (R->input_style & XIMPreeditArea) {
1203 R->set_color (&fg, &bg);
1204
1205 /*
1206 * The necessary width of preedit area is unknown
1207 * until create input context.
1208 */
1209 needed_rect.width = 0;
1210
1211 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1212
1213 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1214 XNForeground, fg, XNBackground, bg,
1215 //XNFontSet, R->TermWin.fontset,
1216 NULL);
1217 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1218 XNForeground, fg, XNBackground, bg,
1219 //XNFontSet, R->TermWin.fontset,
1220 NULL);
1221 }
1222 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1223 XNClientWindow, R->TermWin.parent[0],
1224 XNFocusWindow, R->TermWin.parent[0],
1225 XNDestroyCallback, &ximcallback,
1226 preedit_attr ? XNPreeditAttributes : NULL,
1227 preedit_attr,
1228 status_attr ? XNStatusAttributes : NULL,
1229 status_attr, NULL);
1230 if (preedit_attr)
1231 XFree(preedit_attr);
1232 if (status_attr)
1233 XFree(status_attr);
1234 if (R->Input_Context == NULL) {
1235 rxvt_print_error("failed to create input context");
1236 XCloseIM(xim);
1237 return False;
1238 }
1239 if (R->input_style & XIMPreeditArea)
1240 rxvt_IMSetStatusPosition(aR);
1241 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1242 return True;
1113} 1243}
1114 1244
1115/* 1245/*
1116 * X manual pages and include files don't match on some systems: 1246 * X manual pages and include files don't match on some systems:
1117 * some think this is an XIDProc and others an XIMProc so we can't 1247 * some think this is an XIDProc and others an XIMProc so we can't
… …
1184 if (R->rs[Rs_imLocale]) 1314 if (R->rs[Rs_imLocale])
1185 setlocale (LC_CTYPE, R->locale); 1315 setlocale (LC_CTYPE, R->locale);
1186#endif 1316#endif
1187} 1317}
1188 1318
1189/*
1190 * Try to open a XIM with the current modifiers, then see if we can
1191 * open a suitable preedit type
1192 */
1193/* INTPROTO */
1194Bool
1195rxvt_IM_get_IC(pR)
1196{
1197 int i, j, found;
1198 XIM xim;
1199 XPoint spot;
1200 XRectangle rect, status_rect, needed_rect;
1201 unsigned long fg, bg;
1202 const char *p;
1203 char **s;
1204 XIMStyles *xim_styles;
1205 XVaNestedList preedit_attr, status_attr;
1206 XIMCallback ximcallback;
1207
1208 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1209 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1210 if (xim == NULL)
1211 return False;
1212
1213 xim_styles = NULL;
1214 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1215 || !xim_styles || !xim_styles->count_styles) {
1216 XCloseIM(xim);
1217 return False;
1218 }
1219
1220 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1221 : "OverTheSpot,OffTheSpot,Root";
1222 s = rxvt_splitcommastring(p);
1223 for (i = found = 0; !found && s[i]; i++) {
1224 if (!STRCMP(s[i], "OverTheSpot"))
1225 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1226 else if (!STRCMP(s[i], "OffTheSpot"))
1227 R->input_style = (XIMPreeditArea | XIMStatusArea);
1228 else if (!STRCMP(s[i], "Root"))
1229 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1230
1231 for (j = 0; j < xim_styles->count_styles; j++)
1232 if (R->input_style == xim_styles->supported_styles[j]) {
1233 found = 1;
1234 break;
1235 }
1236 }
1237 for (i = 0; s[i]; i++)
1238 free(s[i]);
1239 free(s);
1240 XFree(xim_styles);
1241
1242 if (!found) {
1243 XCloseIM(xim);
1244 return False;
1245 }
1246
1247 ximcallback.callback = rxvt_IMDestroyCallback;
1248
1249/* XXX: not sure why we need this (as well as IC one below) */
1250 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1251
1252 preedit_attr = status_attr = NULL;
1253
1254 if (R->input_style & XIMPreeditPosition) {
1255 rxvt_setSize(aR_ & rect);
1256 rxvt_setPosition(aR_ & spot);
1257 rxvt_setColor(aR_ & fg, &bg);
1258
1259 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1260 XNSpotLocation, &spot,
1261 XNForeground, fg, XNBackground, bg,
1262 //XNFontSet, R->TermWin.fontset,
1263 NULL);
1264 } else if (R->input_style & XIMPreeditArea) {
1265 rxvt_setColor(aR_ & fg, &bg);
1266
1267 /*
1268 * The necessary width of preedit area is unknown
1269 * until create input context.
1270 */
1271 needed_rect.width = 0;
1272
1273 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1274
1275 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1276 XNForeground, fg, XNBackground, bg,
1277 //XNFontSet, R->TermWin.fontset,
1278 NULL);
1279 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1280 XNForeground, fg, XNBackground, bg,
1281 //XNFontSet, R->TermWin.fontset,
1282 NULL);
1283 }
1284 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1285 XNClientWindow, R->TermWin.parent[0],
1286 XNFocusWindow, R->TermWin.parent[0],
1287 XNDestroyCallback, &ximcallback,
1288 preedit_attr ? XNPreeditAttributes : NULL,
1289 preedit_attr,
1290 status_attr ? XNStatusAttributes : NULL,
1291 status_attr, NULL);
1292 if (preedit_attr)
1293 XFree(preedit_attr);
1294 if (status_attr)
1295 XFree(status_attr);
1296 if (R->Input_Context == NULL) {
1297 rxvt_print_error("failed to create input context");
1298 XCloseIM(xim);
1299 return False;
1300 }
1301 if (R->input_style & XIMPreeditArea)
1302 rxvt_IMSetStatusPosition(aR);
1303 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1304 return True;
1305}
1306
1307/* EXTPROTO */ 1319/* EXTPROTO */
1308void 1320void
1309rxvt_IMSetStatusPosition(pR) 1321rxvt_IMSetStatusPosition(pR)
1310{ 1322{
1311 XRectangle preedit_rect, status_rect, *needed_rect; 1323 XRectangle preedit_rect, status_rect, *needed_rect;
… …
1319/* Getting the necessary width of preedit area */ 1331/* Getting the necessary width of preedit area */
1320 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1332 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1321 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1333 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL);
1322 XFree(status_attr); 1334 XFree(status_attr);
1323 1335
1324 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1336 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1325 1337
1326 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1338 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1327 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1339 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1328 1340
1329 XSetICValues(R->Input_Context, 1341 XSetICValues(R->Input_Context,

Diff Legend

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