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.10 by pcg, Wed Dec 3 23:19:44 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.10 2003/12/03 23:19:44 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 ();
… …
503/*----------------------------------------------------------------------*/ 527/*----------------------------------------------------------------------*/
504/* 528/*
505 * window size/position calculcations for XSizeHint and other storage. 529 * window size/position calculcations for XSizeHint and other storage.
506 * if width/height are non-zero then override calculated width/height 530 * if width/height are non-zero then override calculated width/height
507 */ 531 */
508/* EXTPROTO */
509void 532void
510rxvt_window_calc(pR_ unsigned int width, unsigned int height) 533rxvt_term::window_calc (unsigned int width, unsigned int height)
511{ 534{
512 short recalc_x, recalc_y; 535 short recalc_x, recalc_y;
513 int x, y, sb_w, mb_h, flags; 536 int x, y, sb_w, mb_h, flags;
514 unsigned int w, h; 537 unsigned int w, h;
515 unsigned int max_width, max_height; 538 unsigned int max_width, max_height;
516 539
517 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",
518 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 541 TermWin.ncol, TermWin.nrow, szHint.width,
519 R->szHint.height)); 542 szHint.height));
520 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 543 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
521 R->szHint.win_gravity = NorthWestGravity; 544 szHint.win_gravity = NorthWestGravity;
522/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 545/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
523 546
524 recalc_x = recalc_y = 0; 547 recalc_x = recalc_y = 0;
525 flags = 0; 548 flags = 0;
526 if (!R->parsed_geometry) { 549 if (!parsed_geometry) {
527 R->parsed_geometry = 1; 550 parsed_geometry = 1;
528 if (R->rs[Rs_geometry]) 551 if (rs[Rs_geometry])
529 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 552 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
530 if (flags & WidthValue) { 553 if (flags & WidthValue) {
531 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 554 TermWin.ncol = BOUND_POSITIVE_INT16(w);
532 R->szHint.flags |= USSize; 555 szHint.flags |= USSize;
533 } 556 }
534 if (flags & HeightValue) { 557 if (flags & HeightValue) {
535 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 558 TermWin.nrow = BOUND_POSITIVE_INT16(h);
536 R->szHint.flags |= USSize; 559 szHint.flags |= USSize;
537 } 560 }
538 if (flags & XValue) { 561 if (flags & XValue) {
539 R->szHint.x = x; 562 szHint.x = x;
540 R->szHint.flags |= USPosition; 563 szHint.flags |= USPosition;
541 if (flags & XNegative) { 564 if (flags & XNegative) {
542 recalc_x = 1; 565 recalc_x = 1;
543 R->szHint.win_gravity = NorthEastGravity; 566 szHint.win_gravity = NorthEastGravity;
544 } 567 }
545 } 568 }
546 if (flags & YValue) { 569 if (flags & YValue) {
547 R->szHint.y = y; 570 szHint.y = y;
548 R->szHint.flags |= USPosition; 571 szHint.flags |= USPosition;
549 if (flags & YNegative) { 572 if (flags & YNegative) {
550 recalc_y = 1; 573 recalc_y = 1;
551 if (R->szHint.win_gravity == NorthEastGravity) 574 if (szHint.win_gravity == NorthEastGravity)
552 R->szHint.win_gravity = SouthEastGravity; 575 szHint.win_gravity = SouthEastGravity;
553 else 576 else
554 R->szHint.win_gravity = SouthWestGravity; 577 szHint.win_gravity = SouthWestGravity;
555 } 578 }
556 } 579 }
557 } 580 }
558/* TODO: BOUNDS */ 581/* TODO: BOUNDS */
559 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 582 TermWin.width = TermWin.ncol * TermWin.fwidth;
560 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 583 TermWin.height = TermWin.nrow * TermWin.fheight;
561 max_width = MAX_COLS * R->TermWin.fwidth; 584 max_width = MAX_COLS * TermWin.fwidth;
562 max_height = MAX_ROWS * R->TermWin.fheight; 585 max_height = MAX_ROWS * TermWin.fheight;
563 586
564 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
565 588
566 sb_w = mb_h = 0; 589 sb_w = mb_h = 0;
567 R->window_vt_x = R->window_vt_y = 0; 590 window_vt_x = window_vt_y = 0;
568 if (scrollbar_visible(R)) { 591 if (scrollbar_visible (this)) {
569 sb_w = scrollbar_TotalWidth(); 592 sb_w = scrollbar_TotalWidth();
570 R->szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
571 if (!(R->Options & Opt_scrollBar_right)) 594 if (!(Options & Opt_scrollBar_right))
572 R->window_vt_x = sb_w; 595 window_vt_x = sb_w;
573 } 596 }
574 if (menubar_visible(R)) { 597 if (menubar_visible (this)) {
575 mb_h = menuBar_TotalHeight(); 598 mb_h = menuBar_TotalHeight();
576 R->szHint.base_height += mb_h; 599 szHint.base_height += mb_h;
577 R->window_vt_y = mb_h; 600 window_vt_y = mb_h;
578 } 601 }
579 R->szHint.width_inc = R->TermWin.fwidth; 602 szHint.width_inc = TermWin.fwidth;
580 R->szHint.height_inc = R->TermWin.fheight; 603 szHint.height_inc = TermWin.fheight;
581 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 604 szHint.min_width = szHint.base_width + szHint.width_inc;
582 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 605 szHint.min_height = szHint.base_height + szHint.height_inc;
583 606
584 if (width && width - R->szHint.base_width < max_width) { 607 if (width && width - szHint.base_width < max_width) {
585 R->szHint.width = width; 608 szHint.width = width;
586 R->TermWin.width = width - R->szHint.base_width; 609 TermWin.width = width - szHint.base_width;
587 } else { 610 } else {
588 MIN_IT(R->TermWin.width, max_width); 611 MIN_IT(TermWin.width, max_width);
589 R->szHint.width = R->szHint.base_width + R->TermWin.width; 612 szHint.width = szHint.base_width + TermWin.width;
590 } 613 }
591 if (height && height - R->szHint.base_height < max_height) { 614 if (height && height - szHint.base_height < max_height) {
592 R->szHint.height = height; 615 szHint.height = height;
593 R->TermWin.height = height - R->szHint.base_height; 616 TermWin.height = height - szHint.base_height;
594 } else { 617 } else {
595 MIN_IT(R->TermWin.height, max_height); 618 MIN_IT(TermWin.height, max_height);
596 R->szHint.height = R->szHint.base_height + R->TermWin.height; 619 szHint.height = szHint.base_height + TermWin.height;
597 } 620 }
598 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 621 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right))
599 R->window_sb_x = R->szHint.width - sb_w; 622 window_sb_x = szHint.width - sb_w;
600 623
601 if (recalc_x) 624 if (recalc_x)
602 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 625 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
603 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 626 - szHint.width - 2 * TermWin.ext_bwidth);
604 if (recalc_y) 627 if (recalc_y)
605 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 628 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
606 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 629 - szHint.height - 2 * TermWin.ext_bwidth);
607 630
608 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 631 TermWin.ncol = TermWin.width / TermWin.fwidth;
609 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 632 TermWin.nrow = TermWin.height / TermWin.fheight;
610 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",
611 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 634 TermWin.ncol, TermWin.nrow, szHint.width,
612 R->szHint.height)); 635 szHint.height));
613 return; 636 return;
614} 637}
615 638
616/*----------------------------------------------------------------------*/ 639/*----------------------------------------------------------------------*/
617/* 640/*
… …
619 * Called after a window size change. 642 * Called after a window size change.
620 */ 643 */
621void 644void
622rxvt_term::tt_winch () 645rxvt_term::tt_winch ()
623{ 646{
624 struct winsize ws; 647 struct winsize ws;
625 648
626 if (cmd_fd < 0) 649 if (cmd_fd < 0)
627 return; 650 return;
628 651
629 ws.ws_col = TermWin.ncol; 652 ws.ws_col = TermWin.ncol;
… …
757 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
758 R->PixColors[Color_bg]); 781 R->PixColors[Color_bg]);
759 782
760/* handle Color_BD, scrollbar background, etc. */ 783/* handle Color_BD, scrollbar background, etc. */
761 784
762 rxvt_set_colorfgbg(aR); 785 rxvt_set_colorfgbg (aR);
763 rxvt_recolour_cursor(aR); 786 R->recolour_cursor ();
764/* the only reasonable way to enforce a clean update */ 787/* the only reasonable way to enforce a clean update */
765 rxvt_scr_poweron(aR); 788 rxvt_scr_poweron (aR);
766} 789}
767 790
768#else 791#else
769# define rxvt_set_window_color(aR_ idx,color) ((void)0) 792# define rxvt_set_window_color(aR_ idx,color) ((void)0)
770#endif /* XTERM_COLOR_CHANGE */ 793#endif /* XTERM_COLOR_CHANGE */
771 794
772/* EXTPROTO */
773void 795void
774rxvt_recolour_cursor(pR) 796rxvt_term::recolour_cursor ()
775{ 797{
776 rxvt_color xcol[2];
777
778#if TODO 798#if TODO
799 rxvt_color xcol[2];
800
779 xcol[0] = R->PixColors[Color_pointer]; 801 xcol[0] = PixColors[Color_pointer];
780 xcol[1] = R->PixColors[Color_bg]; 802 xcol[1] = PixColors[Color_bg];
781 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 803 XQueryColors (Xdisplay, XCMAP, xcol, 2);
782 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 804 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
783#endif 805#endif
784} 806}
785 807
786/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
787/* 809/*
… …
847} 869}
848 870
849/* -------------------------------------------------------------------- * 871/* -------------------------------------------------------------------- *
850 * - WINDOW RESIZING - * 872 * - WINDOW RESIZING - *
851 * -------------------------------------------------------------------- */ 873 * -------------------------------------------------------------------- */
852/* EXTPROTO */
853void 874void
854rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 875rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
855 int ignoreparent)
856{ 876{
857 int fix_screen; 877 int fix_screen;
858 878
859#ifdef SMART_RESIZE 879#ifdef SMART_RESIZE
860 int old_width = R->szHint.width, old_height = R->szHint.height; 880 int old_width = szHint.width, old_height = szHint.height;
861#endif 881#endif
862 882
863 rxvt_window_calc(aR_ width, height); 883 window_calc (width, height);
864 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 884 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
865 if (!ignoreparent) { 885 if (!ignoreparent)
886 {
866#ifdef SMART_RESIZE 887#ifdef SMART_RESIZE
867/* 888 /*
868 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 889 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
869 * reposition window on resize depending on placement on screen 890 * reposition window on resize depending on placement on screen
870 */ 891 */
871 int x, y, x1, y1; 892 int x, y, x1, y1;
872 int dx, dy; 893 int dx, dy;
873 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 894 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
874 Window unused_cr; 895 Window unused_cr;
875 896
876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 897 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
877 0, 0, &x, &y, &unused_cr); 898 0, 0, &x, &y, &unused_cr);
878 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 899 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
879 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 900 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
880 /* 901 /*
881 * 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
882 * our position for handles and decorations. Counter it 903 * our position for handles and decorations. Counter it
883 */ 904 */
884 if (x1 != x || y1 != y) { 905 if (x1 != x || y1 != y) {
885 x -= x1; 906 x -= x1;
886 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 ();
887 } 943 }
888 944
889 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 945 if (menubar_visible (this))
890 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 946 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
891 dx = old_width - R->szHint.width; 947 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
892 dy = old_height - R->szHint.height;
893 948
894 /* Check position of the center of the window */ 949 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
895 if (x < x1) /* left half */ 950 window_vt_y, TermWin_TotalWidth (),
896 dx = 0; 951 TermWin_TotalHeight ());
897 else if (x == x1) /* exact center */ 952#ifdef RXVT_GRAPHICS
898 dx /= 2; 953 if (old_height)
899 if (y < y1) /* top half */ 954 rxvt_Gr_Resize (this, old_width - szHint.base_width,
900 dy = 0;
901 else if (y == y1) /* exact center */
902 dy /= 2;
903
904 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
905 R->szHint.width, R->szHint.height);
906#else
907 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
908 R->szHint.height); 955 old_height - szHint.base_height);
909#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)
910 } 964 {
965 int curr_screen = -1;
966 int old_ncol = prev_ncol;
911 967
912 fix_screen = (R->TermWin.ncol != R->prev_ncol 968 /* scr_reset only works on the primary screen */
913 || R->TermWin.nrow != R->prev_nrow); 969 if (old_height) /* this is not the first time through */
914 if (fix_screen || width != R->old_width || height != R->old_height) { 970 {
915 if (scrollbar_visible(R)) { 971 unsigned int ncol = TermWin.ncol;
916 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 972 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
917 0, scrollbar_TotalWidth(), R->szHint.height); 973 curr_screen = rxvt_scr_change_screen (this, PRIMARY);
918 rxvt_Resize_scrollBar(aR); 974 TermWin.ncol = ncol;
919 } 975 }
920 if (menubar_visible(R))
921 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
922 0, TermWin_TotalWidth(), menuBar_TotalHeight());
923 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
924 R->window_vt_y, TermWin_TotalWidth(),
925 TermWin_TotalHeight());
926#ifdef RXVT_GRAPHICS
927 if (R->old_height)
928 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
929 R->old_height - R->szHint.base_height);
930#endif
931 rxvt_scr_clear(aR);
932#ifdef XPM_BACKGROUND
933 rxvt_resize_pixmap(aR);
934#endif
935 }
936 976
937 if (fix_screen || R->old_height == 0) {
938 int curr_screen = -1;
939 uint16_t old_ncol = R->prev_ncol;
940
941 /* scr_reset only works on the primary screen */
942 if (R->old_height) /* this is not the first time through */
943 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
944 rxvt_scr_reset(aR); 977 scr_reset();
978
945 if (curr_screen >= 0) { /* this is not the first time through */ 979 if (curr_screen >= 0) /* this is not the first time through */
980 {
946 rxvt_scr_change_screen(aR_ curr_screen); 981 rxvt_scr_change_screen (this, curr_screen);
947 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 982 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0);
948 } 983 }
949 } 984 }
950 985
951 R->old_width = R->szHint.width; 986 old_width = szHint.width;
952 R->old_height = R->szHint.height; 987 old_height = szHint.height;
953 988
954#ifdef USE_XIM 989#ifdef USE_XIM
955 rxvt_IMSetStatusPosition(aR); 990 rxvt_IMSetStatusPosition (this);
956#endif 991#endif
957} 992}
958 993
959/* 994/*
960 * 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.
… …
974 height = wattr.height - R->szHint.base_height; 1009 height = wattr.height - R->szHint.base_height;
975 } 1010 }
976 if (width != R->TermWin.width || height != R->TermWin.height) { 1011 if (width != R->TermWin.width || height != R->TermWin.height) {
977 width += R->szHint.base_width; 1012 width += R->szHint.base_width;
978 height += R->szHint.base_height; 1013 height += R->szHint.base_height;
979 rxvt_resize_all_windows(aR_ width, height, 0); 1014 R->resize_all_windows (width, height, 0);
980 } 1015 }
981} 1016}
982 1017
983/* -------------------------------------------------------------------- * 1018/* -------------------------------------------------------------------- *
984 * - X INPUT METHOD ROUTINES - * 1019 * - X INPUT METHOD ROUTINES - *
985 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
986#ifdef USE_XIM 1021#ifdef USE_XIM
987/* INTPROTO */
988void 1022void
989rxvt_setSize(pR_ XRectangle * size) 1023rxvt_term::set_size (XRectangle *size)
990{ 1024{
991 size->x = R->TermWin.int_bwidth; 1025 size->x = TermWin.int_bwidth;
992 size->y = R->TermWin.int_bwidth; 1026 size->y = TermWin.int_bwidth;
993 size->width = Width2Pixel(R->TermWin.ncol); 1027 size->width = Width2Pixel(TermWin.ncol);
994 size->height = Height2Pixel(R->TermWin.nrow); 1028 size->height = Height2Pixel(TermWin.nrow);
995} 1029}
996 1030
997/* INTPROTO */
998void 1031void
999rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1032rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
1000{ 1033{
1001 *fg = R->PixColors[Color_fg]; 1034 *fg = PixColors[Color_fg];
1002 *bg = R->PixColors[Color_bg]; 1035 *bg = PixColors[Color_bg];
1003} 1036}
1004 1037
1005/* Checking whether input method is running. */ 1038/* Checking whether input method is running. */
1006/* INTPROTO */ 1039/* INTPROTO */
1007Bool 1040Bool
… …
1042 || R->event_type == SelectionNotify 1075 || R->event_type == SelectionNotify
1043 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1076 || R->event_type == ButtonRelease || R->event_type == FocusIn)
1044 || !rxvt_IMisRunning(aR)) 1077 || !rxvt_IMisRunning(aR))
1045 return; 1078 return;
1046 1079
1047 rxvt_setPosition(aR_ & spot); 1080 R->set_position (&spot);
1048 1081
1049 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1082 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1050 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1083 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1051 XFree(preedit_attr); 1084 XFree(preedit_attr);
1052} 1085}
1053 1086
1054/* EXTPROTO */
1055void 1087void
1056rxvt_setTermFontSet(pR_ int idx)
1057{
1058 char *string;
1059 long length;
1060 int success = 0;
1061
1062 if (idx < 0 || idx >= MAX_NFONTS)
1063 return;
1064}
1065
1066/* INTPROTO */
1067void
1068rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1088rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1069 XRectangle * needed_rect) 1089 XRectangle * needed_rect)
1070{ 1090{
1071 int mbh, vtx = 0; 1091 int mbh, vtx = 0;
1072 1092
1073 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1093 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right))
1074 vtx = scrollbar_TotalWidth(); 1094 vtx = scrollbar_TotalWidth();
1095
1075 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1096 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0;
1076 mbh -= R->TermWin.lineSpace; 1097 mbh -= TermWin.lineSpace;
1077 1098
1078 preedit_rect->x = needed_rect->width + vtx; 1099 preedit_rect->x = needed_rect->width + vtx;
1079 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1100 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1080 1101
1081 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1102 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1082 + vtx;
1083 preedit_rect->height = Height2Pixel(1); 1103 preedit_rect->height = Height2Pixel(1);
1084 1104
1085 status_rect->x = vtx; 1105 status_rect->x = vtx;
1086 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1106 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1087 1107
1088 status_rect->width = needed_rect->width ? needed_rect->width 1108 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1089 : Width2Pixel(R->TermWin.ncol + 1);
1090 status_rect->height = Height2Pixel(1); 1109 status_rect->height = Height2Pixel(1);
1091} 1110}
1092 1111
1093/* ARGSUSED */ 1112/* ARGSUSED */
1094/* INTPROTO */ 1113/* INTPROTO */
1095void 1114void
… …
1105 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1124 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1106 rxvt_IMInstantiateCallback, NULL); 1125 rxvt_IMInstantiateCallback, NULL);
1107} 1126}
1108 1127
1109/* 1128/*
1110 * X manual pages and include files don't match on some systems:
1111 * some think this is an XIDProc and others an XIMProc so we can't
1112 * use the first argument - need to update this to be nice for
1113 * both types via some sort of configure detection
1114 */
1115/* ARGSUSED */
1116/* EXTPROTO */
1117void
1118rxvt_IMInstantiateCallback(Display * unused
1119 __attribute__ ((unused)), XPointer client_data
1120 __attribute__ ((unused)), XPointer call_data
1121 __attribute__ ((unused)))
1122{
1123 dR;
1124 int i, found, had_im;
1125 const char *p;
1126 char **s;
1127 char buf[IMBUFSIZ];
1128
1129 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1130 if (R->Input_Context)
1131 return;
1132
1133 found = had_im = 0;
1134 p = R->rs[Rs_inputMethod];
1135 if (p && *p) {
1136 had_im = 1;
1137 s = rxvt_splitcommastring(p);
1138 for (i = 0; s[i]; i++) {
1139 if (*s[i]) {
1140 STRCPY(buf, "@im=");
1141 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1142 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1143 && (rxvt_IM_get_IC(aR) == True)) {
1144 found = 1;
1145 break;
1146 }
1147 }
1148 }
1149 for (i = 0; s[i]; i++)
1150 free(s[i]);
1151 free(s);
1152 }
1153 if (found)
1154 return;
1155
1156/* try with XMODIFIERS env. var. */
1157 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1158 rxvt_IM_get_IC(aR);
1159 return;
1160 }
1161
1162/* try with no modifiers base IF the user didn't specify an IM */
1163 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1164 && rxvt_IM_get_IC(aR) == True)
1165 return;
1166}
1167
1168/*
1169 * 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
1170 * open a suitable preedit type 1130 * open a suitable preedit type
1171 */ 1131 */
1172/* INTPROTO */ 1132static Bool
1173Bool
1174rxvt_IM_get_IC(pR) 1133rxvt_IM_get_IC (pR)
1175{ 1134{
1176 int i, j, found; 1135 int i, j, found;
1177 XIM xim; 1136 XIM xim;
1178 XPoint spot; 1137 XPoint spot;
1179 XRectangle rect, status_rect, needed_rect; 1138 XRectangle rect, status_rect, needed_rect;
… …
1183 XIMStyles *xim_styles; 1142 XIMStyles *xim_styles;
1184 XVaNestedList preedit_attr, status_attr; 1143 XVaNestedList preedit_attr, status_attr;
1185 XIMCallback ximcallback; 1144 XIMCallback ximcallback;
1186 1145
1187 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1146 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1188 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1147 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1189 if (xim == NULL) 1148 if (xim == NULL)
1190 return False; 1149 return False;
1191 1150
1192 xim_styles = NULL; 1151 xim_styles = NULL;
1193 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1152 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1194 || !xim_styles || !xim_styles->count_styles) { 1153 || !xim_styles || !xim_styles->count_styles) {
1195 XCloseIM(xim); 1154 XCloseIM(xim);
1196 return False; 1155 return False;
1197 } 1156 }
1198 1157
… …
1223 return False; 1182 return False;
1224 } 1183 }
1225 1184
1226 ximcallback.callback = rxvt_IMDestroyCallback; 1185 ximcallback.callback = rxvt_IMDestroyCallback;
1227 1186
1228/* 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) */
1229 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1188 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1230 1189
1231 preedit_attr = status_attr = NULL; 1190 preedit_attr = status_attr = NULL;
1232 1191
1233 if (R->input_style & XIMPreeditPosition) { 1192 if (R->input_style & XIMPreeditPosition) {
1234 rxvt_setSize(aR_ & rect); 1193 R->set_size (&rect);
1235 rxvt_setPosition(aR_ & spot); 1194 R->set_position (&spot);
1236 rxvt_setColor(aR_ & fg, &bg); 1195 R->set_color (&fg, &bg);
1237 1196
1238 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1197 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1239 XNSpotLocation, &spot, 1198 XNSpotLocation, &spot,
1240 XNForeground, fg, XNBackground, bg, 1199 XNForeground, fg, XNBackground, bg,
1241 //XNFontSet, R->TermWin.fontset, 1200 //XNFontSet, R->TermWin.fontset,
1242 NULL); 1201 NULL);
1243 } else if (R->input_style & XIMPreeditArea) { 1202 } else if (R->input_style & XIMPreeditArea) {
1244 rxvt_setColor(aR_ & fg, &bg); 1203 R->set_color (&fg, &bg);
1245 1204
1246 /* 1205 /*
1247 * The necessary width of preedit area is unknown 1206 * The necessary width of preedit area is unknown
1248 * until create input context. 1207 * until create input context.
1249 */ 1208 */
1250 needed_rect.width = 0; 1209 needed_rect.width = 0;
1251 1210
1252 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); 1211 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1253 1212
1254 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1213 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1255 XNForeground, fg, XNBackground, bg, 1214 XNForeground, fg, XNBackground, bg,
1256 //XNFontSet, R->TermWin.fontset, 1215 //XNFontSet, R->TermWin.fontset,
1257 NULL); 1216 NULL);
… …
1281 rxvt_IMSetStatusPosition(aR); 1240 rxvt_IMSetStatusPosition(aR);
1282 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1241 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1283 return True; 1242 return True;
1284} 1243}
1285 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
1286/* EXTPROTO */ 1319/* EXTPROTO */
1287void 1320void
1288rxvt_IMSetStatusPosition(pR) 1321rxvt_IMSetStatusPosition(pR)
1289{ 1322{
1290 XRectangle preedit_rect, status_rect, *needed_rect; 1323 XRectangle preedit_rect, status_rect, *needed_rect;
… …
1298/* Getting the necessary width of preedit area */ 1331/* Getting the necessary width of preedit area */
1299 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1332 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1300 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1333 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL);
1301 XFree(status_attr); 1334 XFree(status_attr);
1302 1335
1303 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1336 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1304 1337
1305 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1338 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1306 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1339 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1307 1340
1308 XSetICValues(R->Input_Context, 1341 XSetICValues(R->Input_Context,

Diff Legend

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