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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.18 by pcg, Fri Dec 19 06:17:03 2003 UTC

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

Diff Legend

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