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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.19 by pcg, Wed Dec 24 09:22:29 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.8 2003/11/27 10:12:10 pcg Exp $ 4 * $Id: main.C,v 1.19 2003/12/24 09:22:29 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
… …
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
63: pty_ev (this, &rxvt_term::pty_cb), 77: destroy_ev (this, &rxvt_term::destroy_cb),
64#ifdef CURSOR_BLINK 78#ifdef CURSOR_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 79 blink_ev (this, &rxvt_term::blink_cb),
66#endif 80#endif
67#ifdef POINTER_BLANK 81#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 82 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 83#endif
70 x_ev (this, &rxvt_term::x_cb), 84 x_ev (this, &rxvt_term::x_cb),
85 check_ev (this, &rxvt_term::check_cb),
86 incr_ev (this, &rxvt_term::incr_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb) 87 pty_ev (this, &rxvt_term::pty_cb)
72{ 88{
73 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
74} 90}
75 91
76rxvt_term::~rxvt_term () 92rxvt_term::~rxvt_term ()
77{ 93{
78 rxvt_scr_release (this); 94 scr_release ();
95
96 free (locale);
97 free (codeset);
79 98
80#ifndef NO_SETOWNER_TTYDEV 99#ifndef NO_SETOWNER_TTYDEV
81 rxvt_privileged_ttydev (this, RESTORE); 100 rxvt_privileged_ttydev (this, RESTORE);
82#endif 101#endif
83#ifdef UTMP_SUPPORT 102#ifdef UTMP_SUPPORT
… …
101} 120}
102 121
103void 122void
104rxvt_term::destroy () 123rxvt_term::destroy ()
105{ 124{
125 check_ev.stop ();
106 pty_ev.stop (); 126 pty_ev.stop ();
107 x_ev.stop (); 127 x_ev.stop ();
108#ifdef CURSOR_BLINK 128#ifdef CURSOR_BLINK
109 blink_ev.stop (); 129 blink_ev.stop ();
110#endif 130#endif
… …
125 145
126/*----------------------------------------------------------------------*/ 146/*----------------------------------------------------------------------*/
127/* rxvt_init() */ 147/* rxvt_init() */
128/* LIBPROTO */ 148/* LIBPROTO */
129rxvt_t 149rxvt_t
130rxvt_init(int argc, const char *const *argv) 150rxvt_init (int argc, const char *const *argv)
131{ 151{
132 SET_R(new rxvt_term); 152 SET_R (new rxvt_term);
133 dR; 153 dR;
134 154
135 if (!R->init_vars () || !R->init (argc, argv)) 155 if (!R->init_vars () || !R->init (argc, argv))
136 { 156 {
137 delete R; 157 delete R;
… …
148/* install exit handler for cleanup */ 168/* install exit handler for cleanup */
149#if 0 169#if 0
150#ifdef HAVE_ATEXIT 170#ifdef HAVE_ATEXIT
151 atexit(rxvt_clean_exit); 171 atexit(rxvt_clean_exit);
152#else 172#else
153# ifdef HAVE_ON_EXIT
154 on_exit(rxvt_clean_exit, NULL); /* non-ANSI exit handler */
155# endif
156#endif 173#endif
157#endif 174#endif
158 175
159 struct sigaction sa; 176 struct sigaction sa;
160 177
161 sigfillset (&sa.sa_mask); 178 sigfillset (&sa.sa_mask);
162 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 179 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
163 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGHUP , &sa, 0); //TODO, also: SIGPIPE 180 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
181 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 186
… …
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 flush (); 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/*
616 * Tell the teletype handler what size the window is. 635 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 636 * Called after a window size change.
618 */ 637 */
619/* EXTPROTO */
620void 638void
621rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 639rxvt_term::tt_winch ()
622{ 640{
623 struct winsize ws; 641 struct winsize ws;
624 642
625 if (fd < 0) 643 if (cmd_fd < 0)
626 return; 644 return;
645
627 ws.ws_col = col; 646 ws.ws_col = TermWin.ncol;
628 ws.ws_row = row; 647 ws.ws_row = TermWin.nrow;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 648 ws.ws_xpixel = ws.ws_ypixel = 0;
630#ifndef DEBUG_SIZE 649#ifndef DEBUG_SIZE
631 (void)ioctl(fd, TIOCSWINSZ, &ws); 650 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
632#else 651#else
633 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 652 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 653 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
635 }
636# ifdef SIGWINCH 654# ifdef SIGWINCH
637 else if (pid) /* force through to the command */ 655 else if (cmd_pid) /* force through to the command */
638 kill(pid, SIGWINCH); 656 kill (cmd_pid, SIGWINCH);
639# endif 657# endif
640#endif 658#endif
641} 659}
642 660
643/*----------------------------------------------------------------------*/ 661/*----------------------------------------------------------------------*/
… …
756 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 774 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
757 R->PixColors[Color_bg]); 775 R->PixColors[Color_bg]);
758 776
759/* handle Color_BD, scrollbar background, etc. */ 777/* handle Color_BD, scrollbar background, etc. */
760 778
761 rxvt_set_colorfgbg(aR); 779 rxvt_set_colorfgbg (aR);
762 rxvt_recolour_cursor(aR); 780 R->recolour_cursor ();
763/* the only reasonable way to enforce a clean update */ 781/* the only reasonable way to enforce a clean update */
764 rxvt_scr_poweron(aR); 782 rxvt_scr_poweron (aR);
765} 783}
766 784
767#else 785#else
768# define rxvt_set_window_color(aR_ idx,color) ((void)0) 786# define rxvt_set_window_color(aR_ idx,color) ((void)0)
769#endif /* XTERM_COLOR_CHANGE */ 787#endif /* XTERM_COLOR_CHANGE */
770 788
771/* EXTPROTO */
772void 789void
773rxvt_recolour_cursor(pR) 790rxvt_term::recolour_cursor ()
774{ 791{
775 rxvt_color xcol[2];
776
777#if TODO 792#if TODO
793 rxvt_color xcol[2];
794
778 xcol[0] = R->PixColors[Color_pointer]; 795 xcol[0] = PixColors[Color_pointer];
779 xcol[1] = R->PixColors[Color_bg]; 796 xcol[1] = PixColors[Color_bg];
780 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 797 XQueryColors (Xdisplay, XCMAP, xcol, 2);
781 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 798 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
782#endif 799#endif
783} 800}
784 801
785/*----------------------------------------------------------------------*/ 802/*----------------------------------------------------------------------*/
786/* 803/*
… …
846} 863}
847 864
848/* -------------------------------------------------------------------- * 865/* -------------------------------------------------------------------- *
849 * - WINDOW RESIZING - * 866 * - WINDOW RESIZING - *
850 * -------------------------------------------------------------------- */ 867 * -------------------------------------------------------------------- */
851/* EXTPROTO */
852void 868void
853rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 869rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
854 int ignoreparent)
855{ 870{
856 int fix_screen; 871 int fix_screen;
857 872
858#ifdef SMART_RESIZE 873#ifdef SMART_RESIZE
859 int old_width = R->szHint.width, old_height = R->szHint.height; 874 int old_width = szHint.width, old_height = szHint.height;
860#endif 875#endif
861 876
862 rxvt_window_calc(aR_ width, height); 877 window_calc (width, height);
863 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 878 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
864 if (!ignoreparent) { 879 if (!ignoreparent)
880 {
865#ifdef SMART_RESIZE 881#ifdef SMART_RESIZE
866/* 882 /*
867 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 883 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
868 * reposition window on resize depending on placement on screen 884 * reposition window on resize depending on placement on screen
869 */ 885 */
870 int x, y, x1, y1; 886 int x, y, x1, y1;
871 int dx, dy; 887 int dx, dy;
872 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 888 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
873 Window unused_cr; 889 Window unused_cr;
874 890
875 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 891 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
876 0, 0, &x, &y, &unused_cr); 892 0, 0, &x, &y, &unused_cr);
877 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 893 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
878 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 894 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
879 /* 895 /*
880 * 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
881 * our position for handles and decorations. Counter it 897 * our position for handles and decorations. Counter it
882 */ 898 */
883 if (x1 != x || y1 != y) { 899 if (x1 != x || y1 != y) {
884 x -= x1; 900 x -= x1;
885 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 ();
886 } 937 }
887 938
888 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 939 if (menubar_visible (this))
889 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 940 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
890 dx = old_width - R->szHint.width; 941 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
891 dy = old_height - R->szHint.height;
892 942
893 /* Check position of the center of the window */ 943 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
894 if (x < x1) /* left half */ 944 window_vt_y, TermWin_TotalWidth (),
895 dx = 0; 945 TermWin_TotalHeight ());
896 else if (x == x1) /* exact center */ 946#ifdef RXVT_GRAPHICS
897 dx /= 2; 947 if (old_height)
898 if (y < y1) /* top half */ 948 rxvt_Gr_Resize (this, old_width - szHint.base_width,
899 dy = 0;
900 else if (y == y1) /* exact center */
901 dy /= 2;
902
903 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
904 R->szHint.width, R->szHint.height);
905#else
906 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
907 R->szHint.height); 949 old_height - szHint.base_height);
908#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)
909 } 958 {
959 int curr_screen = -1;
960 int old_ncol = prev_ncol;
910 961
911 fix_screen = (R->TermWin.ncol != R->prev_ncol 962 /* scr_reset only works on the primary screen */
912 || R->TermWin.nrow != R->prev_nrow); 963 if (old_height) /* this is not the first time through */
913 if (fix_screen || width != R->old_width || height != R->old_height) { 964 {
914 if (scrollbar_visible(R)) { 965 unsigned int ncol = TermWin.ncol;
915 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 966 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
916 0, scrollbar_TotalWidth(), R->szHint.height); 967 curr_screen = rxvt_scr_change_screen (this, PRIMARY);
917 rxvt_Resize_scrollBar(aR); 968 TermWin.ncol = ncol;
918 } 969 }
919 if (menubar_visible(R))
920 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
921 0, TermWin_TotalWidth(), menuBar_TotalHeight());
922 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
923 R->window_vt_y, TermWin_TotalWidth(),
924 TermWin_TotalHeight());
925#ifdef RXVT_GRAPHICS
926 if (R->old_height)
927 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
928 R->old_height - R->szHint.base_height);
929#endif
930 rxvt_scr_clear(aR);
931#ifdef XPM_BACKGROUND
932 rxvt_resize_pixmap(aR);
933#endif
934 }
935 970
936 if (fix_screen || R->old_height == 0) {
937 int curr_screen = -1;
938 uint16_t old_ncol = R->prev_ncol;
939
940 /* scr_reset only works on the primary screen */
941 if (R->old_height) /* this is not the first time through */
942 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
943 rxvt_scr_reset(aR); 971 scr_reset();
972
944 if (curr_screen >= 0) { /* this is not the first time through */ 973 if (curr_screen >= 0) /* this is not the first time through */
974 {
945 rxvt_scr_change_screen(aR_ curr_screen); 975 rxvt_scr_change_screen (this, curr_screen);
946 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 976 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0);
947 } 977 }
948 } 978 }
949 979
950 R->old_width = R->szHint.width; 980 old_width = szHint.width;
951 R->old_height = R->szHint.height; 981 old_height = szHint.height;
952 982
953#ifdef USE_XIM 983#ifdef USE_XIM
954 rxvt_IMSetStatusPosition(aR); 984 rxvt_IMSetStatusPosition (this);
955#endif 985#endif
956} 986}
957 987
958/* 988/*
959 * Set the width/height of the vt window in characters. Units are pixels. 989 * Set the width/height of the vt window in characters. Units are pixels.
… …
973 height = wattr.height - R->szHint.base_height; 1003 height = wattr.height - R->szHint.base_height;
974 } 1004 }
975 if (width != R->TermWin.width || height != R->TermWin.height) { 1005 if (width != R->TermWin.width || height != R->TermWin.height) {
976 width += R->szHint.base_width; 1006 width += R->szHint.base_width;
977 height += R->szHint.base_height; 1007 height += R->szHint.base_height;
978 rxvt_resize_all_windows(aR_ width, height, 0); 1008 R->resize_all_windows (width, height, 0);
979 } 1009 }
980} 1010}
981 1011
982/* -------------------------------------------------------------------- * 1012/* -------------------------------------------------------------------- *
983 * - X INPUT METHOD ROUTINES - * 1013 * - X INPUT METHOD ROUTINES - *
984 * -------------------------------------------------------------------- */ 1014 * -------------------------------------------------------------------- */
985#ifdef USE_XIM 1015#ifdef USE_XIM
986/* INTPROTO */
987void 1016void
988rxvt_setSize(pR_ XRectangle * size) 1017rxvt_term::set_size (XRectangle *size)
989{ 1018{
990 size->x = R->TermWin.int_bwidth; 1019 size->x = TermWin.int_bwidth;
991 size->y = R->TermWin.int_bwidth; 1020 size->y = TermWin.int_bwidth;
992 size->width = Width2Pixel(R->TermWin.ncol); 1021 size->width = Width2Pixel(TermWin.ncol);
993 size->height = Height2Pixel(R->TermWin.nrow); 1022 size->height = Height2Pixel(TermWin.nrow);
994} 1023}
995 1024
996/* INTPROTO */
997void 1025void
998rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1026rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
999{ 1027{
1000 *fg = R->PixColors[Color_fg]; 1028 *fg = PixColors[Color_fg];
1001 *bg = R->PixColors[Color_bg]; 1029 *bg = PixColors[Color_bg];
1002} 1030}
1003 1031
1004/* Checking whether input method is running. */ 1032/* Checking whether input method is running. */
1005/* INTPROTO */ 1033/* INTPROTO */
1006Bool 1034Bool
… …
1041 || R->event_type == SelectionNotify 1069 || R->event_type == SelectionNotify
1042 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1070 || R->event_type == ButtonRelease || R->event_type == FocusIn)
1043 || !rxvt_IMisRunning(aR)) 1071 || !rxvt_IMisRunning(aR))
1044 return; 1072 return;
1045 1073
1046 rxvt_setPosition(aR_ & spot); 1074 R->set_position (&spot);
1047 1075
1048 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1076 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1049 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1077 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1050 XFree(preedit_attr); 1078 XFree(preedit_attr);
1051} 1079}
1052 1080
1053/* EXTPROTO */
1054void 1081void
1055rxvt_setTermFontSet(pR_ int idx)
1056{
1057 char *string;
1058 long length;
1059 int success = 0;
1060
1061 if (idx < 0 || idx >= MAX_NFONTS)
1062 return;
1063}
1064
1065/* INTPROTO */
1066void
1067rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1082rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect) 1083 XRectangle * needed_rect)
1069{ 1084{
1070 int mbh, vtx = 0; 1085 int mbh, vtx = 0;
1071 1086
1072 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1087 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth(); 1088 vtx = scrollbar_TotalWidth();
1089
1074 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1090 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0;
1075 mbh -= R->TermWin.lineSpace; 1091 mbh -= TermWin.lineSpace;
1076 1092
1077 preedit_rect->x = needed_rect->width + vtx; 1093 preedit_rect->x = needed_rect->width + vtx;
1078 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1094 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1079 1095
1080 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1096 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1081 + vtx;
1082 preedit_rect->height = Height2Pixel(1); 1097 preedit_rect->height = Height2Pixel(1);
1083 1098
1084 status_rect->x = vtx; 1099 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1100 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1086 1101
1087 status_rect->width = needed_rect->width ? needed_rect->width 1102 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1088 : Width2Pixel(R->TermWin.ncol + 1);
1089 status_rect->height = Height2Pixel(1); 1103 status_rect->height = Height2Pixel(1);
1090} 1104}
1091 1105
1092/* ARGSUSED */ 1106/* ARGSUSED */
1093/* INTPROTO */ 1107/* INTPROTO */
1094void 1108void
… …
1104 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1118 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1105 rxvt_IMInstantiateCallback, NULL); 1119 rxvt_IMInstantiateCallback, NULL);
1106} 1120}
1107 1121
1108/* 1122/*
1109 * X manual pages and include files don't match on some systems:
1110 * some think this is an XIDProc and others an XIMProc so we can't
1111 * use the first argument - need to update this to be nice for
1112 * both types via some sort of configure detection
1113 */
1114/* ARGSUSED */
1115/* EXTPROTO */
1116void
1117rxvt_IMInstantiateCallback(Display * unused
1118 __attribute__ ((unused)), XPointer client_data
1119 __attribute__ ((unused)), XPointer call_data
1120 __attribute__ ((unused)))
1121{
1122 dR;
1123 int i, found, had_im;
1124 const char *p;
1125 char **s;
1126 char buf[IMBUFSIZ];
1127
1128 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1129 if (R->Input_Context)
1130 return;
1131
1132 found = had_im = 0;
1133 p = R->rs[Rs_inputMethod];
1134 if (p && *p) {
1135 had_im = 1;
1136 s = rxvt_splitcommastring(p);
1137 for (i = 0; s[i]; i++) {
1138 if (*s[i]) {
1139 STRCPY(buf, "@im=");
1140 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1141 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1142 && (rxvt_IM_get_IC(aR) == True)) {
1143 found = 1;
1144 break;
1145 }
1146 }
1147 }
1148 for (i = 0; s[i]; i++)
1149 free(s[i]);
1150 free(s);
1151 }
1152 if (found)
1153 return;
1154
1155/* try with XMODIFIERS env. var. */
1156 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1157 rxvt_IM_get_IC(aR);
1158 return;
1159 }
1160
1161/* try with no modifiers base IF the user didn't specify an IM */
1162 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1163 && rxvt_IM_get_IC(aR) == True)
1164 return;
1165}
1166
1167/*
1168 * Try to open a XIM with the current modifiers, then see if we can 1123 * Try to open a XIM with the current modifiers, then see if we can
1169 * open a suitable preedit type 1124 * open a suitable preedit type
1170 */ 1125 */
1171/* INTPROTO */ 1126static Bool
1172Bool
1173rxvt_IM_get_IC(pR) 1127rxvt_IM_get_IC (pR)
1174{ 1128{
1175 int i, j, found; 1129 int i, j, found;
1176 XIM xim; 1130 XIM xim;
1177 XPoint spot; 1131 XPoint spot;
1178 XRectangle rect, status_rect, needed_rect; 1132 XRectangle rect, status_rect, needed_rect;
… …
1182 XIMStyles *xim_styles; 1136 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr; 1137 XVaNestedList preedit_attr, status_attr;
1184 XIMCallback ximcallback; 1138 XIMCallback ximcallback;
1185 1139
1186 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1140 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1187 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1141 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1188 if (xim == NULL) 1142 if (xim == NULL)
1189 return False; 1143 return False;
1190 1144
1191 xim_styles = NULL; 1145 xim_styles = NULL;
1192 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1146 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1193 || !xim_styles || !xim_styles->count_styles) { 1147 || !xim_styles || !xim_styles->count_styles) {
1194 XCloseIM(xim); 1148 XCloseIM(xim);
1195 return False; 1149 return False;
1196 } 1150 }
1197 1151
… …
1222 return False; 1176 return False;
1223 } 1177 }
1224 1178
1225 ximcallback.callback = rxvt_IMDestroyCallback; 1179 ximcallback.callback = rxvt_IMDestroyCallback;
1226 1180
1227/* XXX: not sure why we need this (as well as IC one below) */ 1181 /* XXX: not sure why we need this (as well as IC one below) */
1228 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1182 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1229 1183
1230 preedit_attr = status_attr = NULL; 1184 preedit_attr = status_attr = NULL;
1231 1185
1232 if (R->input_style & XIMPreeditPosition) { 1186 if (R->input_style & XIMPreeditPosition) {
1233 rxvt_setSize(aR_ & rect); 1187 R->set_size (&rect);
1234 rxvt_setPosition(aR_ & spot); 1188 R->set_position (&spot);
1235 rxvt_setColor(aR_ & fg, &bg); 1189 R->set_color (&fg, &bg);
1236 1190
1237 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1191 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1238 XNSpotLocation, &spot, 1192 XNSpotLocation, &spot,
1239 XNForeground, fg, XNBackground, bg, 1193 XNForeground, fg, XNBackground, bg,
1240 //XNFontSet, R->TermWin.fontset, 1194 //XNFontSet, R->TermWin.fontset,
1241 NULL); 1195 NULL);
1242 } else if (R->input_style & XIMPreeditArea) { 1196 } else if (R->input_style & XIMPreeditArea) {
1243 rxvt_setColor(aR_ & fg, &bg); 1197 R->set_color (&fg, &bg);
1244 1198
1245 /* 1199 /*
1246 * The necessary width of preedit area is unknown 1200 * The necessary width of preedit area is unknown
1247 * until create input context. 1201 * until create input context.
1248 */ 1202 */
1249 needed_rect.width = 0; 1203 needed_rect.width = 0;
1250 1204
1251 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); 1205 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1252 1206
1253 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1207 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1254 XNForeground, fg, XNBackground, bg, 1208 XNForeground, fg, XNBackground, bg,
1255 //XNFontSet, R->TermWin.fontset, 1209 //XNFontSet, R->TermWin.fontset,
1256 NULL); 1210 NULL);
… …
1280 rxvt_IMSetStatusPosition(aR); 1234 rxvt_IMSetStatusPosition(aR);
1281 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1235 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1282 return True; 1236 return True;
1283} 1237}
1284 1238
1239/*
1240 * X manual pages and include files don't match on some systems:
1241 * some think this is an XIDProc and others an XIMProc so we can't
1242 * use the first argument - need to update this to be nice for
1243 * both types via some sort of configure detection
1244 */
1245/* ARGSUSED */
1246/* EXTPROTO */
1247void
1248rxvt_IMInstantiateCallback(Display * unused
1249 __attribute__ ((unused)), XPointer client_data
1250 __attribute__ ((unused)), XPointer call_data
1251 __attribute__ ((unused)))
1252{
1253 dR;
1254 int i, found, had_im;
1255 const char *p;
1256 char **s;
1257 char buf[IMBUFSIZ];
1258
1259 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1260 if (R->Input_Context)
1261 return;
1262
1263#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1264 if (R->rs[Rs_imLocale])
1265 setlocale (LC_CTYPE, R->rs[Rs_imLocale]);
1266#endif
1267
1268 p = R->rs[Rs_inputMethod];
1269 if (p && *p)
1270 {
1271 bool found = false;
1272
1273 s = rxvt_splitcommastring (p);
1274 for (i = 0; s[i]; i++)
1275 {
1276 if (*s[i])
1277 {
1278 STRCPY (buf, "@im=");
1279 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1280 if ((p = XSetLocaleModifiers (buf)) && *p
1281 && rxvt_IM_get_IC (aR))
1282 {
1283 found = true;
1284 break;
1285 }
1286 }
1287 }
1288 for (i = 0; s[i]; i++)
1289 free(s[i]);
1290 free(s);
1291
1292 if (found)
1293 goto done;
1294 }
1295
1296/* try with XMODIFIERS env. var. */
1297 if ((p = XSetLocaleModifiers ("")) && *p
1298 && rxvt_IM_get_IC (aR))
1299 goto done;
1300
1301/* try with no modifiers base IF the user didn't specify an IM */
1302 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1303 && rxvt_IM_get_IC (aR) == True)
1304 goto done;
1305
1306done:
1307#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1308 if (R->rs[Rs_imLocale])
1309 setlocale (LC_CTYPE, R->locale);
1310#endif
1311}
1312
1285/* EXTPROTO */ 1313/* EXTPROTO */
1286void 1314void
1287rxvt_IMSetStatusPosition(pR) 1315rxvt_IMSetStatusPosition(pR)
1288{ 1316{
1289 XRectangle preedit_rect, status_rect, *needed_rect; 1317 XRectangle preedit_rect, status_rect, *needed_rect;
… …
1297/* Getting the necessary width of preedit area */ 1325/* Getting the necessary width of preedit area */
1298 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1326 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1299 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1327 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL);
1300 XFree(status_attr); 1328 XFree(status_attr);
1301 1329
1302 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1330 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1303 1331
1304 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1332 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1305 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1333 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1306 1334
1307 XSetICValues(R->Input_Context, 1335 XSetICValues(R->Input_Context,

Diff Legend

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