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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines