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.11 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.19 by pcg, Wed Dec 24 09:22:29 2003 UTC

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

Diff Legend

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