ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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