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

Diff Legend

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