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

Diff Legend

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