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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.21 by pcg, Thu Jan 29 23:26:01 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.15 2003/12/18 05:45:11 pcg Exp $ 4 * $Id: main.C,v 1.21 2004/01/29 23:26:01 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
49static char curlocale[128]; 49static char curlocale[128];
50 50
51void 51void
52rxvt_set_locale (const char *locale) 52rxvt_set_locale (const char *locale)
53{ 53{
54 if (locale && strncmp (locale, curlocale, 128)) 54 if (locale && STRNCMP (locale, curlocale, 128))
55 { 55 {
56 strncpy (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
58 } 58 }
59} 59}
60 60
61void * 61void *
… …
72{ 72{
73 free (p); 73 free (p);
74} 74}
75 75
76rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77: pty_ev (this, &rxvt_term::pty_cb), 77: destroy_ev (this, &rxvt_term::destroy_cb),
78#ifdef CURSOR_BLINK 78#ifdef CURSOR_BLINK
79 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
80#endif
81#ifdef TEXT_BLINK
79 blink_ev (this, &rxvt_term::blink_cb), 82 text_blink_ev (this, &rxvt_term::text_blink_cb),
80#endif 83#endif
81#ifdef POINTER_BLANK 84#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb), 85 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif 86#endif
84 x_ev (this, &rxvt_term::x_cb), 87 x_ev (this, &rxvt_term::x_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb),
86 check_ev (this, &rxvt_term::check_cb), 88 check_ev (this, &rxvt_term::check_cb),
87 incr_ev (this, &rxvt_term::incr_cb) 89 incr_ev (this, &rxvt_term::incr_cb),
90 pty_ev (this, &rxvt_term::pty_cb)
88{ 91{
89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
90} 93}
91 94
92rxvt_term::~rxvt_term () 95rxvt_term::~rxvt_term ()
… …
124{ 127{
125 check_ev.stop (); 128 check_ev.stop ();
126 pty_ev.stop (); 129 pty_ev.stop ();
127 x_ev.stop (); 130 x_ev.stop ();
128#ifdef CURSOR_BLINK 131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
129 blink_ev.stop (); 135 text_blink_ev.stop ();
130#endif 136#endif
131#ifdef POINTER_BLANK 137#ifdef POINTER_BLANK
132 pointer_ev.stop (); 138 pointer_ev.stop ();
133#endif 139#endif
134 140
… …
202 * 2. chown tty on some systems 208 * 2. chown tty on some systems
203 */ 209 */
204 rxvt_privileges (this, SAVE); 210 rxvt_privileges (this, SAVE);
205 rxvt_privileges (this, IGNORE); 211 rxvt_privileges (this, IGNORE);
206 212
207#if HAVE_XSETLOCALE || HAVE_SETLOCALE
208 locale = strdup (setlocale (LC_CTYPE, ""));
209#endif
210#if HAVE_NL_LANGINFO
211 codeset = strdup (nl_langinfo (CODESET));
212#endif
213
214 init_secondary (); 213 init_secondary ();
215 214
216 const char **cmd_argv = init_resources (argc, argv); 215 const char **cmd_argv = init_resources (argc, argv);
216
217 set_locale ("");
217 218
218#if (MENUBAR_MAX) 219#if (MENUBAR_MAX)
219 rxvt_menubar_read (this, rs[Rs_menu]); 220 rxvt_menubar_read (this, rs[Rs_menu]);
220#endif 221#endif
221#ifdef HAVE_SCROLLBARS 222#ifdef HAVE_SCROLLBARS
222 if (Options & Opt_scrollBar) 223 if (Options & Opt_scrollBar)
223 scrollBar.setIdle (); /* set existence for size calculations */ 224 scrollBar.setIdle (); /* set existence for size calculations */
224#endif 225#endif
225 226
226 rxvt_Create_Windows (this, argc, argv); 227 create_windows (argc, argv);
227 228
228 init_xlocale (); 229 init_xlocale ();
229 230
230 scr_reset (); /* initialize screen */ 231 scr_reset (); /* initialize screen */
231#ifdef RXVT_GRAPHICS 232#ifdef RXVT_GRAPHICS
… …
238#endif 239#endif
239#endif 240#endif
240 241
241#ifdef HAVE_SCROLLBARS 242#ifdef HAVE_SCROLLBARS
242 if (Options & Opt_scrollBar) 243 if (Options & Opt_scrollBar)
243 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 244 resize_scrollbar (); /* create and map scrollbar */
244#endif 245#endif
245#if (MENUBAR_MAX) 246#if (MENUBAR_MAX)
246 if (menubar_visible(r)) 247 if (menubar_visible(r))
247 XMapWindow (Xdisplay, menuBar.win); 248 XMapWindow (Xdisplay, menuBar.win);
248#endif 249#endif
… …
526/*----------------------------------------------------------------------*/ 527/*----------------------------------------------------------------------*/
527/* 528/*
528 * window size/position calculcations for XSizeHint and other storage. 529 * window size/position calculcations for XSizeHint and other storage.
529 * if width/height are non-zero then override calculated width/height 530 * if width/height are non-zero then override calculated width/height
530 */ 531 */
531/* EXTPROTO */
532void 532void
533rxvt_window_calc(pR_ unsigned int width, unsigned int height) 533rxvt_term::window_calc (unsigned int width, unsigned int height)
534{ 534{
535 short recalc_x, recalc_y; 535 short recalc_x, recalc_y;
536 int x, y, sb_w, mb_h, flags; 536 int x, y, sb_w, mb_h, flags;
537 unsigned int w, h; 537 unsigned int w, h;
538 unsigned int max_width, max_height; 538 unsigned int max_width, max_height;
539 539
540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
541 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 541 TermWin.ncol, TermWin.nrow, szHint.width,
542 R->szHint.height)); 542 szHint.height));
543 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 543 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
544 R->szHint.win_gravity = NorthWestGravity; 544 szHint.win_gravity = NorthWestGravity;
545/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 545/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
546 546
547 recalc_x = recalc_y = 0; 547 recalc_x = recalc_y = 0;
548 flags = 0; 548 flags = 0;
549 if (!R->parsed_geometry) { 549 if (!parsed_geometry) {
550 R->parsed_geometry = 1; 550 parsed_geometry = 1;
551 if (R->rs[Rs_geometry]) 551 if (rs[Rs_geometry])
552 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 552 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
553 if (flags & WidthValue) { 553 if (flags & WidthValue) {
554 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 554 TermWin.ncol = BOUND_POSITIVE_INT16(w);
555 R->szHint.flags |= USSize; 555 szHint.flags |= USSize;
556 } 556 }
557 if (flags & HeightValue) { 557 if (flags & HeightValue) {
558 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 558 TermWin.nrow = BOUND_POSITIVE_INT16(h);
559 R->szHint.flags |= USSize; 559 szHint.flags |= USSize;
560 } 560 }
561 if (flags & XValue) { 561 if (flags & XValue) {
562 R->szHint.x = x; 562 szHint.x = x;
563 R->szHint.flags |= USPosition; 563 szHint.flags |= USPosition;
564 if (flags & XNegative) { 564 if (flags & XNegative) {
565 recalc_x = 1; 565 recalc_x = 1;
566 R->szHint.win_gravity = NorthEastGravity; 566 szHint.win_gravity = NorthEastGravity;
567 } 567 }
568 } 568 }
569 if (flags & YValue) { 569 if (flags & YValue) {
570 R->szHint.y = y; 570 szHint.y = y;
571 R->szHint.flags |= USPosition; 571 szHint.flags |= USPosition;
572 if (flags & YNegative) { 572 if (flags & YNegative) {
573 recalc_y = 1; 573 recalc_y = 1;
574 if (R->szHint.win_gravity == NorthEastGravity) 574 if (szHint.win_gravity == NorthEastGravity)
575 R->szHint.win_gravity = SouthEastGravity; 575 szHint.win_gravity = SouthEastGravity;
576 else 576 else
577 R->szHint.win_gravity = SouthWestGravity; 577 szHint.win_gravity = SouthWestGravity;
578 } 578 }
579 } 579 }
580 } 580 }
581/* TODO: BOUNDS */ 581/* TODO: BOUNDS */
582 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 582 TermWin.width = TermWin.ncol * TermWin.fwidth;
583 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 583 TermWin.height = TermWin.nrow * TermWin.fheight;
584 max_width = MAX_COLS * R->TermWin.fwidth; 584 max_width = MAX_COLS * TermWin.fwidth;
585 max_height = MAX_ROWS * R->TermWin.fheight; 585 max_height = MAX_ROWS * TermWin.fheight;
586 586
587 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
588 588
589 sb_w = mb_h = 0; 589 sb_w = mb_h = 0;
590 R->window_vt_x = R->window_vt_y = 0; 590 window_vt_x = window_vt_y = 0;
591 if (scrollbar_visible(R)) { 591 if (scrollbar_visible (this)) {
592 sb_w = scrollbar_TotalWidth(); 592 sb_w = scrollbar_TotalWidth();
593 R->szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
594 if (!(R->Options & Opt_scrollBar_right)) 594 if (!(Options & Opt_scrollBar_right))
595 R->window_vt_x = sb_w; 595 window_vt_x = sb_w;
596 } 596 }
597 if (menubar_visible(R)) { 597 if (menubar_visible (this)) {
598 mb_h = menuBar_TotalHeight(); 598 mb_h = menuBar_TotalHeight();
599 R->szHint.base_height += mb_h; 599 szHint.base_height += mb_h;
600 R->window_vt_y = mb_h; 600 window_vt_y = mb_h;
601 } 601 }
602 R->szHint.width_inc = R->TermWin.fwidth; 602 szHint.width_inc = TermWin.fwidth;
603 R->szHint.height_inc = R->TermWin.fheight; 603 szHint.height_inc = TermWin.fheight;
604 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 604 szHint.min_width = szHint.base_width + szHint.width_inc;
605 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 605 szHint.min_height = szHint.base_height + szHint.height_inc;
606 606
607 if (width && width - R->szHint.base_width < max_width) { 607 if (width && width - szHint.base_width < max_width) {
608 R->szHint.width = width; 608 szHint.width = width;
609 R->TermWin.width = width - R->szHint.base_width; 609 TermWin.width = width - szHint.base_width;
610 } else { 610 } else {
611 MIN_IT(R->TermWin.width, max_width); 611 MIN_IT(TermWin.width, max_width);
612 R->szHint.width = R->szHint.base_width + R->TermWin.width; 612 szHint.width = szHint.base_width + TermWin.width;
613 } 613 }
614 if (height && height - R->szHint.base_height < max_height) { 614 if (height && height - szHint.base_height < max_height) {
615 R->szHint.height = height; 615 szHint.height = height;
616 R->TermWin.height = height - R->szHint.base_height; 616 TermWin.height = height - szHint.base_height;
617 } else { 617 } else {
618 MIN_IT(R->TermWin.height, max_height); 618 MIN_IT(TermWin.height, max_height);
619 R->szHint.height = R->szHint.base_height + R->TermWin.height; 619 szHint.height = szHint.base_height + TermWin.height;
620 } 620 }
621 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 621 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right))
622 R->window_sb_x = R->szHint.width - sb_w; 622 window_sb_x = szHint.width - sb_w;
623 623
624 if (recalc_x) 624 if (recalc_x)
625 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 625 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
626 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 626 - szHint.width - 2 * TermWin.ext_bwidth);
627 if (recalc_y) 627 if (recalc_y)
628 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 628 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
629 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 629 - szHint.height - 2 * TermWin.ext_bwidth);
630 630
631 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 631 TermWin.ncol = TermWin.width / TermWin.fwidth;
632 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 632 TermWin.nrow = TermWin.height / TermWin.fheight;
633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
634 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 634 TermWin.ncol, TermWin.nrow, szHint.width,
635 R->szHint.height)); 635 szHint.height));
636 return; 636 return;
637} 637}
638 638
639/*----------------------------------------------------------------------*/ 639/*----------------------------------------------------------------------*/
640/* 640/*
… …
642 * Called after a window size change. 642 * Called after a window size change.
643 */ 643 */
644void 644void
645rxvt_term::tt_winch () 645rxvt_term::tt_winch ()
646{ 646{
647 struct winsize ws; 647 struct winsize ws;
648 648
649 if (cmd_fd < 0) 649 if (cmd_fd < 0)
650 return; 650 return;
651 651
652 ws.ws_col = TermWin.ncol; 652 ws.ws_col = TermWin.ncol;
… …
869} 869}
870 870
871/* -------------------------------------------------------------------- * 871/* -------------------------------------------------------------------- *
872 * - WINDOW RESIZING - * 872 * - WINDOW RESIZING - *
873 * -------------------------------------------------------------------- */ 873 * -------------------------------------------------------------------- */
874/* EXTPROTO */
875void 874void
876rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 875rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
877 int ignoreparent)
878{ 876{
879 int fix_screen; 877 int fix_screen;
880 878
881#ifdef SMART_RESIZE 879#ifdef SMART_RESIZE
882 int old_width = R->szHint.width, old_height = R->szHint.height; 880 int old_width = szHint.width, old_height = szHint.height;
883#endif 881#endif
884 882
885 rxvt_window_calc(aR_ width, height); 883 window_calc (width, height);
886 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 884 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
887 if (!ignoreparent) { 885 if (!ignoreparent)
886 {
888#ifdef SMART_RESIZE 887#ifdef SMART_RESIZE
889/* 888 /*
890 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 889 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
891 * reposition window on resize depending on placement on screen 890 * reposition window on resize depending on placement on screen
892 */ 891 */
893 int x, y, x1, y1; 892 int x, y, x1, y1;
894 int dx, dy; 893 int dx, dy;
895 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 894 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
896 Window unused_cr; 895 Window unused_cr;
897 896
898 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 897 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
899 0, 0, &x, &y, &unused_cr); 898 0, 0, &x, &y, &unused_cr);
900 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 899 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
901 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 900 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
902 /* 901 /*
903 * if Xroot isn't the parent window, a WM will probably have offset 902 * if Xroot isn't the parent window, a WM will probably have offset
904 * our position for handles and decorations. Counter it 903 * our position for handles and decorations. Counter it
905 */ 904 */
906 if (x1 != x || y1 != y) { 905 if (x1 != x || y1 != y) {
907 x -= x1; 906 x -= x1;
908 y -= y1; 907 y -= y1;
908 }
909
910 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
911 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
912 dx = old_width - szHint.width;
913 dy = old_height - szHint.height;
914
915 /* Check position of the center of the window */
916 if (x < x1) /* left half */
917 dx = 0;
918 else if (x == x1) /* exact center */
919 dx /= 2;
920 if (y < y1) /* top half */
921 dy = 0;
922 else if (y == y1) /* exact center */
923 dy /= 2;
924
925 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
926 szHint.width, szHint.height);
927#else
928 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
929 szHint.height);
930#endif
931 }
932
933 fix_screen = (TermWin.ncol != prev_ncol
934 || TermWin.nrow != prev_nrow);
935
936 if (fix_screen || width != old_width || height != old_height)
937 {
938 if (scrollbar_visible (this))
939 {
940 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
941 0, scrollbar_TotalWidth (), szHint.height);
942 resize_scrollbar ();
909 } 943 }
910 944
911 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 945 if (menubar_visible (this))
912 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 946 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
913 dx = old_width - R->szHint.width; 947 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
914 dy = old_height - R->szHint.height;
915 948
916 /* Check position of the center of the window */ 949 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
917 if (x < x1) /* left half */ 950 window_vt_y, TermWin_TotalWidth (),
918 dx = 0; 951 TermWin_TotalHeight ());
919 else if (x == x1) /* exact center */ 952#ifdef RXVT_GRAPHICS
920 dx /= 2; 953 if (old_height)
921 if (y < y1) /* top half */ 954 rxvt_Gr_Resize (this, old_width - szHint.base_width,
922 dy = 0;
923 else if (y == y1) /* exact center */
924 dy /= 2;
925
926 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
927 R->szHint.width, R->szHint.height);
928#else
929 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
930 R->szHint.height); 955 old_height - szHint.base_height);
931#endif 956#endif
957 scr_clear ();
958#ifdef XPM_BACKGROUND
959 rxvt_resize_pixmap (this);
960#endif
961 }
962
963 if (fix_screen || old_height == 0)
932 } 964 {
965 int curr_screen = -1;
966 int old_ncol = prev_ncol;
933 967
934 fix_screen = (R->TermWin.ncol != R->prev_ncol 968 /* scr_reset only works on the primary screen */
935 || R->TermWin.nrow != R->prev_nrow); 969 if (old_height) /* this is not the first time through */
936 if (fix_screen || width != R->old_width || height != R->old_height) { 970 {
937 if (scrollbar_visible(R)) { 971 unsigned int ncol = TermWin.ncol;
938 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 972 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
939 0, scrollbar_TotalWidth(), R->szHint.height); 973 curr_screen = rxvt_scr_change_screen (this, PRIMARY);
940 rxvt_Resize_scrollBar(aR); 974 TermWin.ncol = ncol;
941 } 975 }
942 if (menubar_visible(R))
943 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
944 0, TermWin_TotalWidth(), menuBar_TotalHeight());
945 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
946 R->window_vt_y, TermWin_TotalWidth(),
947 TermWin_TotalHeight());
948#ifdef RXVT_GRAPHICS
949 if (R->old_height)
950 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
951 R->old_height - R->szHint.base_height);
952#endif
953 rxvt_scr_clear(aR);
954#ifdef XPM_BACKGROUND
955 rxvt_resize_pixmap(aR);
956#endif
957 }
958 976
959 if (fix_screen || R->old_height == 0) {
960 int curr_screen = -1;
961 uint16_t old_ncol = R->prev_ncol;
962
963 /* scr_reset only works on the primary screen */
964 if (R->old_height) /* this is not the first time through */
965 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
966
967 R->scr_reset(); 977 scr_reset();
968 978
969 if (curr_screen >= 0) { /* this is not the first time through */ 979 if (curr_screen >= 0) /* this is not the first time through */
980 {
970 rxvt_scr_change_screen(aR_ curr_screen); 981 rxvt_scr_change_screen (this, curr_screen);
971 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 982 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0);
972 } 983 }
973 } 984 }
974 985
975 R->old_width = R->szHint.width; 986 old_width = szHint.width;
976 R->old_height = R->szHint.height; 987 old_height = szHint.height;
977 988
978#ifdef USE_XIM 989#ifdef USE_XIM
979 rxvt_IMSetStatusPosition(aR); 990 rxvt_IMSetStatusPosition (this);
980#endif 991#endif
981} 992}
982 993
983/* 994/*
984 * Set the width/height of the vt window in characters. Units are pixels. 995 * Set the width/height of the vt window in characters. Units are pixels.
… …
998 height = wattr.height - R->szHint.base_height; 1009 height = wattr.height - R->szHint.base_height;
999 } 1010 }
1000 if (width != R->TermWin.width || height != R->TermWin.height) { 1011 if (width != R->TermWin.width || height != R->TermWin.height) {
1001 width += R->szHint.base_width; 1012 width += R->szHint.base_width;
1002 height += R->szHint.base_height; 1013 height += R->szHint.base_height;
1003 rxvt_resize_all_windows(aR_ width, height, 0); 1014 R->resize_all_windows (width, height, 0);
1004 } 1015 }
1005} 1016}
1006 1017
1007/* -------------------------------------------------------------------- * 1018/* -------------------------------------------------------------------- *
1008 * - X INPUT METHOD ROUTINES - * 1019 * - X INPUT METHOD ROUTINES - *
1009 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
1010#ifdef USE_XIM 1021#ifdef USE_XIM
1011/* INTPROTO */
1012void 1022void
1013rxvt_setSize(pR_ XRectangle * size) 1023rxvt_term::set_size (XRectangle *size)
1014{ 1024{
1015 size->x = R->TermWin.int_bwidth; 1025 size->x = TermWin.int_bwidth;
1016 size->y = R->TermWin.int_bwidth; 1026 size->y = TermWin.int_bwidth;
1017 size->width = Width2Pixel(R->TermWin.ncol); 1027 size->width = Width2Pixel(TermWin.ncol);
1018 size->height = Height2Pixel(R->TermWin.nrow); 1028 size->height = Height2Pixel(TermWin.nrow);
1019} 1029}
1020 1030
1021/* INTPROTO */
1022void 1031void
1023rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1032rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
1024{ 1033{
1025 *fg = R->PixColors[Color_fg]; 1034 *fg = PixColors[Color_fg];
1026 *bg = R->PixColors[Color_bg]; 1035 *bg = PixColors[Color_bg];
1027} 1036}
1028 1037
1029/* Checking whether input method is running. */ 1038/* Checking whether input method is running. */
1030/* INTPROTO */ 1039/* INTPROTO */
1031Bool 1040Bool
… …
1066 || R->event_type == SelectionNotify 1075 || R->event_type == SelectionNotify
1067 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1076 || R->event_type == ButtonRelease || R->event_type == FocusIn)
1068 || !rxvt_IMisRunning(aR)) 1077 || !rxvt_IMisRunning(aR))
1069 return; 1078 return;
1070 1079
1071 rxvt_setPosition(aR_ & spot); 1080 R->set_position (&spot);
1072 1081
1073 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1082 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1074 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1083 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1075 XFree(preedit_attr); 1084 XFree(preedit_attr);
1076} 1085}
1077 1086
1078/* EXTPROTO */
1079void 1087void
1080rxvt_setTermFontSet(pR_ int idx)
1081{
1082 char *string;
1083 long length;
1084 int success = 0;
1085
1086 if (idx < 0 || idx >= MAX_NFONTS)
1087 return;
1088}
1089
1090/* INTPROTO */
1091void
1092rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1088rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1093 XRectangle * needed_rect) 1089 XRectangle * needed_rect)
1094{ 1090{
1095 int mbh, vtx = 0; 1091 int mbh, vtx = 0;
1096 1092
1097 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1093 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right))
1098 vtx = scrollbar_TotalWidth(); 1094 vtx = scrollbar_TotalWidth();
1095
1099 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1096 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0;
1100 mbh -= R->TermWin.lineSpace; 1097 mbh -= TermWin.lineSpace;
1101 1098
1102 preedit_rect->x = needed_rect->width + vtx; 1099 preedit_rect->x = needed_rect->width + vtx;
1103 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1100 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1104 1101
1105 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1102 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1106 + vtx;
1107 preedit_rect->height = Height2Pixel(1); 1103 preedit_rect->height = Height2Pixel(1);
1108 1104
1109 status_rect->x = vtx; 1105 status_rect->x = vtx;
1110 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1106 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1111 1107
1112 status_rect->width = needed_rect->width ? needed_rect->width 1108 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1113 : Width2Pixel(R->TermWin.ncol + 1);
1114 status_rect->height = Height2Pixel(1); 1109 status_rect->height = Height2Pixel(1);
1115} 1110}
1116 1111
1117/* ARGSUSED */ 1112/* ARGSUSED */
1118/* INTPROTO */ 1113/* INTPROTO */
1119void 1114void
… …
1126 R->Input_Context = NULL; 1121 R->Input_Context = NULL;
1127/* To avoid Segmentation Fault in C locale: Solaris only? */ 1122/* To avoid Segmentation Fault in C locale: Solaris only? */
1128 if (STRCMP(R->locale, "C")) 1123 if (STRCMP(R->locale, "C"))
1129 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1124 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1130 rxvt_IMInstantiateCallback, NULL); 1125 rxvt_IMInstantiateCallback, NULL);
1126}
1127
1128/*
1129 * Try to open a XIM with the current modifiers, then see if we can
1130 * open a suitable preedit type
1131 */
1132static Bool
1133rxvt_IM_get_IC (pR)
1134{
1135 int i, j, found;
1136 XIM xim;
1137 XPoint spot;
1138 XRectangle rect, status_rect, needed_rect;
1139 unsigned long fg, bg;
1140 const char *p;
1141 char **s;
1142 XIMStyles *xim_styles;
1143 XVaNestedList preedit_attr, status_attr;
1144 XIMCallback ximcallback;
1145
1146 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1147 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1148 if (xim == NULL)
1149 return False;
1150
1151 xim_styles = NULL;
1152 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1153 || !xim_styles || !xim_styles->count_styles) {
1154 XCloseIM(xim);
1155 return False;
1156 }
1157
1158 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1159 : "OverTheSpot,OffTheSpot,Root";
1160 s = rxvt_splitcommastring(p);
1161 for (i = found = 0; !found && s[i]; i++) {
1162 if (!STRCMP(s[i], "OverTheSpot"))
1163 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1164 else if (!STRCMP(s[i], "OffTheSpot"))
1165 R->input_style = (XIMPreeditArea | XIMStatusArea);
1166 else if (!STRCMP(s[i], "Root"))
1167 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1168
1169 for (j = 0; j < xim_styles->count_styles; j++)
1170 if (R->input_style == xim_styles->supported_styles[j]) {
1171 found = 1;
1172 break;
1173 }
1174 }
1175 for (i = 0; s[i]; i++)
1176 free(s[i]);
1177 free(s);
1178 XFree(xim_styles);
1179
1180 if (!found) {
1181 XCloseIM(xim);
1182 return False;
1183 }
1184
1185 ximcallback.callback = rxvt_IMDestroyCallback;
1186
1187 /* XXX: not sure why we need this (as well as IC one below) */
1188 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1189
1190 preedit_attr = status_attr = NULL;
1191
1192 if (R->input_style & XIMPreeditPosition) {
1193 R->set_size (&rect);
1194 R->set_position (&spot);
1195 R->set_color (&fg, &bg);
1196
1197 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1198 XNSpotLocation, &spot,
1199 XNForeground, fg, XNBackground, bg,
1200 //XNFontSet, R->TermWin.fontset,
1201 NULL);
1202 } else if (R->input_style & XIMPreeditArea) {
1203 R->set_color (&fg, &bg);
1204
1205 /*
1206 * The necessary width of preedit area is unknown
1207 * until create input context.
1208 */
1209 needed_rect.width = 0;
1210
1211 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1212
1213 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1214 XNForeground, fg, XNBackground, bg,
1215 //XNFontSet, R->TermWin.fontset,
1216 NULL);
1217 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1218 XNForeground, fg, XNBackground, bg,
1219 //XNFontSet, R->TermWin.fontset,
1220 NULL);
1221 }
1222 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1223 XNClientWindow, R->TermWin.parent[0],
1224 XNFocusWindow, R->TermWin.parent[0],
1225 XNDestroyCallback, &ximcallback,
1226 preedit_attr ? XNPreeditAttributes : NULL,
1227 preedit_attr,
1228 status_attr ? XNStatusAttributes : NULL,
1229 status_attr, NULL);
1230 if (preedit_attr)
1231 XFree(preedit_attr);
1232 if (status_attr)
1233 XFree(status_attr);
1234 if (R->Input_Context == NULL) {
1235 rxvt_print_error("failed to create input context");
1236 XCloseIM(xim);
1237 return False;
1238 }
1239 if (R->input_style & XIMPreeditArea)
1240 rxvt_IMSetStatusPosition(aR);
1241 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1242 return True;
1131} 1243}
1132 1244
1133/* 1245/*
1134 * X manual pages and include files don't match on some systems: 1246 * X manual pages and include files don't match on some systems:
1135 * some think this is an XIDProc and others an XIMProc so we can't 1247 * some think this is an XIDProc and others an XIMProc so we can't
… …
1202 if (R->rs[Rs_imLocale]) 1314 if (R->rs[Rs_imLocale])
1203 setlocale (LC_CTYPE, R->locale); 1315 setlocale (LC_CTYPE, R->locale);
1204#endif 1316#endif
1205} 1317}
1206 1318
1207/*
1208 * Try to open a XIM with the current modifiers, then see if we can
1209 * open a suitable preedit type
1210 */
1211/* INTPROTO */
1212Bool
1213rxvt_IM_get_IC(pR)
1214{
1215 int i, j, found;
1216 XIM xim;
1217 XPoint spot;
1218 XRectangle rect, status_rect, needed_rect;
1219 unsigned long fg, bg;
1220 const char *p;
1221 char **s;
1222 XIMStyles *xim_styles;
1223 XVaNestedList preedit_attr, status_attr;
1224 XIMCallback ximcallback;
1225
1226 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1227 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1228 if (xim == NULL)
1229 return False;
1230
1231 xim_styles = NULL;
1232 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1233 || !xim_styles || !xim_styles->count_styles) {
1234 XCloseIM(xim);
1235 return False;
1236 }
1237
1238 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1239 : "OverTheSpot,OffTheSpot,Root";
1240 s = rxvt_splitcommastring(p);
1241 for (i = found = 0; !found && s[i]; i++) {
1242 if (!STRCMP(s[i], "OverTheSpot"))
1243 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1244 else if (!STRCMP(s[i], "OffTheSpot"))
1245 R->input_style = (XIMPreeditArea | XIMStatusArea);
1246 else if (!STRCMP(s[i], "Root"))
1247 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1248
1249 for (j = 0; j < xim_styles->count_styles; j++)
1250 if (R->input_style == xim_styles->supported_styles[j]) {
1251 found = 1;
1252 break;
1253 }
1254 }
1255 for (i = 0; s[i]; i++)
1256 free(s[i]);
1257 free(s);
1258 XFree(xim_styles);
1259
1260 if (!found) {
1261 XCloseIM(xim);
1262 return False;
1263 }
1264
1265 ximcallback.callback = rxvt_IMDestroyCallback;
1266
1267/* XXX: not sure why we need this (as well as IC one below) */
1268 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1269
1270 preedit_attr = status_attr = NULL;
1271
1272 if (R->input_style & XIMPreeditPosition) {
1273 rxvt_setSize(aR_ & rect);
1274 rxvt_setPosition(aR_ & spot);
1275 rxvt_setColor(aR_ & fg, &bg);
1276
1277 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1278 XNSpotLocation, &spot,
1279 XNForeground, fg, XNBackground, bg,
1280 //XNFontSet, R->TermWin.fontset,
1281 NULL);
1282 } else if (R->input_style & XIMPreeditArea) {
1283 rxvt_setColor(aR_ & fg, &bg);
1284
1285 /*
1286 * The necessary width of preedit area is unknown
1287 * until create input context.
1288 */
1289 needed_rect.width = 0;
1290
1291 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1292
1293 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1294 XNForeground, fg, XNBackground, bg,
1295 //XNFontSet, R->TermWin.fontset,
1296 NULL);
1297 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1298 XNForeground, fg, XNBackground, bg,
1299 //XNFontSet, R->TermWin.fontset,
1300 NULL);
1301 }
1302 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1303 XNClientWindow, R->TermWin.parent[0],
1304 XNFocusWindow, R->TermWin.parent[0],
1305 XNDestroyCallback, &ximcallback,
1306 preedit_attr ? XNPreeditAttributes : NULL,
1307 preedit_attr,
1308 status_attr ? XNStatusAttributes : NULL,
1309 status_attr, NULL);
1310 if (preedit_attr)
1311 XFree(preedit_attr);
1312 if (status_attr)
1313 XFree(status_attr);
1314 if (R->Input_Context == NULL) {
1315 rxvt_print_error("failed to create input context");
1316 XCloseIM(xim);
1317 return False;
1318 }
1319 if (R->input_style & XIMPreeditArea)
1320 rxvt_IMSetStatusPosition(aR);
1321 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1322 return True;
1323}
1324
1325/* EXTPROTO */ 1319/* EXTPROTO */
1326void 1320void
1327rxvt_IMSetStatusPosition(pR) 1321rxvt_IMSetStatusPosition(pR)
1328{ 1322{
1329 XRectangle preedit_rect, status_rect, *needed_rect; 1323 XRectangle preedit_rect, status_rect, *needed_rect;
… …
1337/* Getting the necessary width of preedit area */ 1331/* Getting the necessary width of preedit area */
1338 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1332 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1339 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1333 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL);
1340 XFree(status_attr); 1334 XFree(status_attr);
1341 1335
1342 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1336 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1343 1337
1344 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1338 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1345 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1339 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1346 1340
1347 XSetICValues(R->Input_Context, 1341 XSetICValues(R->Input_Context,

Diff Legend

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