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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.20 by pcg, Fri Jan 16 16:34:56 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.4 2003/11/25 15:25:17 pcg Exp $ 4 * $Id: main.C,v 1.20 2004/01/16 16:34:56 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),
78#ifdef CURSOR_BLINK
79 blink_ev (this, &rxvt_term::blink_cb),
80#endif
81#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif
64 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),
87 pty_ev (this, &rxvt_term::pty_cb)
65{ 88{
66 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
67} 90}
68 91
69rxvt_term::~rxvt_term () 92rxvt_term::~rxvt_term ()
70{ 93{
94 scr_release ();
95
96 free (locale);
97 free (codeset);
98
99#ifndef NO_SETOWNER_TTYDEV
100 rxvt_privileged_ttydev (this, RESTORE);
101#endif
102#ifdef UTMP_SUPPORT
103 rxvt_privileged_utmp (this, RESTORE);
104#endif
105#ifdef USE_XIM
106 if (Input_Context != NULL)
107 {
108 XDestroyIC (Input_Context);
109 Input_Context = NULL;
110 }
111#endif
112
113 if (cmd_fd >= 0)
114 close (cmd_fd);
115
116 if (Xfd >= 0)
117 XCloseDisplay (Xdisplay);
118
71 delete PixColors; 119 delete PixColors;
120}
121
122void
123rxvt_term::destroy ()
124{
125 check_ev.stop ();
126 pty_ev.stop ();
127 x_ev.stop ();
128#ifdef CURSOR_BLINK
129 blink_ev.stop ();
130#endif
131#ifdef POINTER_BLANK
132 pointer_ev.stop ();
133#endif
134
135 destroy_ev.start (0);
136}
137
138void
139rxvt_term::destroy_cb (time_watcher &w)
140{
141 SET_R (this);
142
143 delete this;
72} 144}
73 145
74/*----------------------------------------------------------------------*/ 146/*----------------------------------------------------------------------*/
75/* rxvt_init() */ 147/* rxvt_init() */
76/* LIBPROTO */ 148/* LIBPROTO */
77rxvt_t 149rxvt_t
78rxvt_init(int argc, const char *const *argv) 150rxvt_init (int argc, const char *const *argv)
79{ 151{
80 SET_R(new rxvt_term); 152 SET_R (new rxvt_term);
81 dR; 153 dR;
82 154
83 if (!R->init_vars () || !R->init (argc, argv)) 155 if (!R->init_vars () || !R->init (argc, argv))
84 { 156 {
85 delete R; 157 delete R;
… …
87 } 159 }
88 160
89 return R; 161 return R;
90} 162}
91 163
164/* EXTPROTO */
165void
166rxvt_init_signals ()
167{
168/* install exit handler for cleanup */
169#if 0
170#ifdef HAVE_ATEXIT
171 atexit(rxvt_clean_exit);
172#else
173#endif
174#endif
175
176 struct sigaction sa;
177
178 sigfillset (&sa.sa_mask);
179 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
180 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
181 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
186
187/* need to trap SIGURG for SVR4 (Unixware) rlogin */
188/* signal (SIGURG, SIG_DFL); */
189
190 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
191 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
192}
193
92bool 194bool
93rxvt_term::init (int argc, const char *const *argv) 195rxvt_term::init (int argc, const char *const *argv)
94{ 196{
95 dR;//TODO (scrollbar, setidle)
96
97 /* 197 /*
98 * Save and then give up any super-user privileges 198 * Save and then give up any super-user privileges
99 * 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.
100 * We should only need to be root in these cases: 200 * We should only need to be root in these cases:
101 * 1. write utmp entries on some systems 201 * 1. write utmp entries on some systems
102 * 2. chown tty on some systems 202 * 2. chown tty on some systems
103 */ 203 */
104 rxvt_privileges (this, SAVE); 204 rxvt_privileges (this, SAVE);
105 rxvt_privileges (this, IGNORE); 205 rxvt_privileges (this, IGNORE);
106 206
107 rxvt_init_secondary (this); 207 init_secondary ();
108 208
109 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 209 const char **cmd_argv = init_resources (argc, argv);
210
211 set_locale ("");
110 212
111#if (MENUBAR_MAX) 213#if (MENUBAR_MAX)
112 rxvt_menubar_read (this, rs[Rs_menu]); 214 rxvt_menubar_read (this, rs[Rs_menu]);
113#endif 215#endif
114#ifdef HAVE_SCROLLBARS 216#ifdef HAVE_SCROLLBARS
115 if (Options & Opt_scrollBar) 217 if (Options & Opt_scrollBar)
116 scrollbar_setIdle (); /* set existence for size calculations */ 218 scrollBar.setIdle (); /* set existence for size calculations */
117#endif 219#endif
118 220
119 rxvt_Create_Windows (this, argc, argv); 221 create_windows (argc, argv);
120 222
121 rxvt_init_xlocale (this); 223 init_xlocale ();
122 224
123 rxvt_scr_reset (this); /* initialize screen */ 225 scr_reset (); /* initialize screen */
124#ifdef RXVT_GRAPHICS 226#ifdef RXVT_GRAPHICS
125 rxvt_Gr_reset (this); /* reset graphics */ 227 rxvt_Gr_reset (this); /* reset graphics */
126#endif 228#endif
127 229
128#if 0 230#if 0
129#ifdef DEBUG_X 231#ifdef DEBUG_X
130 XSynchronize(Xdisplay, True); 232 XSynchronize(Xdisplay, True);
131 XSetErrorHandler((XErrorHandler) abort);
132#else
133 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
134#endif 233#endif
135#endif 234#endif
136 235
137#ifdef HAVE_SCROLLBARS 236#ifdef HAVE_SCROLLBARS
138 if (Options & Opt_scrollBar) 237 if (Options & Opt_scrollBar)
139 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 238 resize_scrollbar (); /* create and map scrollbar */
140#endif 239#endif
141#if (MENUBAR_MAX) 240#if (MENUBAR_MAX)
142 if (menubar_visible(r)) 241 if (menubar_visible(r))
143 XMapWindow (Xdisplay, menuBar.win); 242 XMapWindow (Xdisplay, menuBar.win);
144#endif 243#endif
… …
150 } 249 }
151#endif 250#endif
152 XMapWindow (Xdisplay, TermWin.vt); 251 XMapWindow (Xdisplay, TermWin.vt);
153 XMapWindow (Xdisplay, TermWin.parent[0]); 252 XMapWindow (Xdisplay, TermWin.parent[0]);
154 253
155 rxvt_init_env (this); 254 init_env ();
156 rxvt_init_command (this, cmd_argv); 255 init_command (cmd_argv);
157 256
158 x_ev.start (Xfd, EVENT_READ); 257 x_ev.start (Xfd, EVENT_READ);
159 pty_ev.start (cmd_fd, EVENT_READ); 258 pty_ev.start (cmd_fd, EVENT_READ);
259
260 check_ev.start ();
261
262 process_x_events ();
160 263
161 return true; 264 return true;
162} 265}
163 266
164/* ------------------------------------------------------------------------- * 267/* ------------------------------------------------------------------------- *
… …
170/* ARGSUSED */ 273/* ARGSUSED */
171/* EXTPROTO */ 274/* EXTPROTO */
172RETSIGTYPE 275RETSIGTYPE
173rxvt_Child_signal(int sig __attribute__ ((unused))) 276rxvt_Child_signal(int sig __attribute__ ((unused)))
174{ 277{
175 dR;
176 int pid, save_errno = errno; 278 int pid, save_errno = errno;
177
178 do {
179 errno = 0;
180 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 279 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
280 ;
281 errno = save_errno;
181 282
283#if 0
182 if (pid == R->cmd_pid) 284 if (pid == R->cmd_pid)
183 exit(EXIT_SUCCESS); 285 exit (EXIT_SUCCESS);
184 286#endif
185 errno = save_errno;
186 signal(SIGCHLD, rxvt_Child_signal);
187} 287}
188 288
189/* 289/*
190 * Catch a fatal signal and tidy up before quitting 290 * Catch a fatal signal and tidy up before quitting
191 */ 291 */
… …
205/* INTPROTO */ 305/* INTPROTO */
206int 306int
207rxvt_xerror_handler(const Display * display 307rxvt_xerror_handler(const Display * display
208 __attribute__ ((unused)), const XErrorEvent * event) 308 __attribute__ ((unused)), const XErrorEvent * event)
209{ 309{
210 dR; 310 dR;
211 311
212 if (R->allowedxerror == -1) { 312 if (R->allowedxerror == -1)
213 R->allowedxerror = event->error_code; 313 R->allowedxerror = event->error_code;
214 return 0; /* ignored anyway */ 314 else
215 } 315 {
216 rxvt_print_error("XError: Request: %d . %d, Error: %d", 316 rxvt_print_error("XError: Request: %d . %d, Error: %d",
217 event->request_code, event->minor_code, 317 event->request_code, event->minor_code,
218 event->error_code); 318 event->error_code);
219/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 319
220 exit(EXIT_FAILURE); 320 R->destroy ();
221/* NOTREACHED */ 321 }
322
323 return 0;
222} 324}
223 325
224/*----------------------------------------------------------------------*/ 326/*----------------------------------------------------------------------*/
225/* 327/*
226 * Exit gracefully, clearing the utmp entry and restoring tty attributes 328 * Exit gracefully, clearing the utmp entry and restoring tty attributes
227 * TODO: if debugging, this should free up any known resources if we can 329 * TODO: if debugging, this should free up any known resources if we can
228 */ 330 */
229/* EXTPROTO */ 331/* EXTPROTO */
230void 332void
231rxvt_clean_exit(void) 333rxvt_clean_exit ()
232{ 334{
233 dR; 335 dR;
234 336
235#ifdef DEBUG_SCREEN 337 R->destroy ();
236 rxvt_scr_release(aR);
237#endif
238#ifndef NO_SETOWNER_TTYDEV
239 rxvt_privileged_ttydev(aR_ RESTORE);
240#endif
241#ifdef UTMP_SUPPORT
242 rxvt_privileged_utmp(aR_ RESTORE);
243#endif
244#ifdef USE_XIM
245 if (R->Input_Context != NULL) {
246 XDestroyIC(R->Input_Context);
247 R->Input_Context = NULL;
248 }
249#endif
250} 338}
251 339
252/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
253 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
254 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
… …
433/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
434/* 522/*
435 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculcations for XSizeHint and other storage.
436 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
437 */ 525 */
438/* EXTPROTO */
439void 526void
440rxvt_window_calc(pR_ unsigned int width, unsigned int height) 527rxvt_term::window_calc (unsigned int width, unsigned int height)
441{ 528{
442 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
443 int x, y, sb_w, mb_h, flags; 530 int x, y, sb_w, mb_h, flags;
444 unsigned int w, h; 531 unsigned int w, h;
445 unsigned int max_width, max_height; 532 unsigned int max_width, max_height;
446 533
447 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",
448 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 535 TermWin.ncol, TermWin.nrow, szHint.width,
449 R->szHint.height)); 536 szHint.height));
450 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 537 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
451 R->szHint.win_gravity = NorthWestGravity; 538 szHint.win_gravity = NorthWestGravity;
452/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 539/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
453 540
454 recalc_x = recalc_y = 0; 541 recalc_x = recalc_y = 0;
455 flags = 0; 542 flags = 0;
456 if (!R->parsed_geometry) { 543 if (!parsed_geometry) {
457 R->parsed_geometry = 1; 544 parsed_geometry = 1;
458 if (R->rs[Rs_geometry]) 545 if (rs[Rs_geometry])
459 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 546 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
460 if (flags & WidthValue) { 547 if (flags & WidthValue) {
461 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 548 TermWin.ncol = BOUND_POSITIVE_INT16(w);
462 R->szHint.flags |= USSize; 549 szHint.flags |= USSize;
463 } 550 }
464 if (flags & HeightValue) { 551 if (flags & HeightValue) {
465 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 552 TermWin.nrow = BOUND_POSITIVE_INT16(h);
466 R->szHint.flags |= USSize; 553 szHint.flags |= USSize;
467 } 554 }
468 if (flags & XValue) { 555 if (flags & XValue) {
469 R->szHint.x = x; 556 szHint.x = x;
470 R->szHint.flags |= USPosition; 557 szHint.flags |= USPosition;
471 if (flags & XNegative) { 558 if (flags & XNegative) {
472 recalc_x = 1; 559 recalc_x = 1;
473 R->szHint.win_gravity = NorthEastGravity; 560 szHint.win_gravity = NorthEastGravity;
474 } 561 }
475 } 562 }
476 if (flags & YValue) { 563 if (flags & YValue) {
477 R->szHint.y = y; 564 szHint.y = y;
478 R->szHint.flags |= USPosition; 565 szHint.flags |= USPosition;
479 if (flags & YNegative) { 566 if (flags & YNegative) {
480 recalc_y = 1; 567 recalc_y = 1;
481 if (R->szHint.win_gravity == NorthEastGravity) 568 if (szHint.win_gravity == NorthEastGravity)
482 R->szHint.win_gravity = SouthEastGravity; 569 szHint.win_gravity = SouthEastGravity;
483 else 570 else
484 R->szHint.win_gravity = SouthWestGravity; 571 szHint.win_gravity = SouthWestGravity;
485 } 572 }
486 } 573 }
487 } 574 }
488/* TODO: BOUNDS */ 575/* TODO: BOUNDS */
489 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 576 TermWin.width = TermWin.ncol * TermWin.fwidth;
490 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 577 TermWin.height = TermWin.nrow * TermWin.fheight;
491 max_width = MAX_COLS * R->TermWin.fwidth; 578 max_width = MAX_COLS * TermWin.fwidth;
492 max_height = MAX_ROWS * R->TermWin.fheight; 579 max_height = MAX_ROWS * TermWin.fheight;
493 580
494 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 581 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
495 582
496 sb_w = mb_h = 0; 583 sb_w = mb_h = 0;
497 R->window_vt_x = R->window_vt_y = 0; 584 window_vt_x = window_vt_y = 0;
498 if (scrollbar_visible(R)) { 585 if (scrollbar_visible (this)) {
499 sb_w = scrollbar_TotalWidth(); 586 sb_w = scrollbar_TotalWidth();
500 R->szHint.base_width += sb_w; 587 szHint.base_width += sb_w;
501 if (!(R->Options & Opt_scrollBar_right)) 588 if (!(Options & Opt_scrollBar_right))
502 R->window_vt_x = sb_w; 589 window_vt_x = sb_w;
503 } 590 }
504 if (menubar_visible(R)) { 591 if (menubar_visible (this)) {
505 mb_h = menuBar_TotalHeight(); 592 mb_h = menuBar_TotalHeight();
506 R->szHint.base_height += mb_h; 593 szHint.base_height += mb_h;
507 R->window_vt_y = mb_h; 594 window_vt_y = mb_h;
508 } 595 }
509 R->szHint.width_inc = R->TermWin.fwidth; 596 szHint.width_inc = TermWin.fwidth;
510 R->szHint.height_inc = R->TermWin.fheight; 597 szHint.height_inc = TermWin.fheight;
511 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 598 szHint.min_width = szHint.base_width + szHint.width_inc;
512 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 599 szHint.min_height = szHint.base_height + szHint.height_inc;
513 600
514 if (width && width - R->szHint.base_width < max_width) { 601 if (width && width - szHint.base_width < max_width) {
515 R->szHint.width = width; 602 szHint.width = width;
516 R->TermWin.width = width - R->szHint.base_width; 603 TermWin.width = width - szHint.base_width;
517 } else { 604 } else {
518 MIN_IT(R->TermWin.width, max_width); 605 MIN_IT(TermWin.width, max_width);
519 R->szHint.width = R->szHint.base_width + R->TermWin.width; 606 szHint.width = szHint.base_width + TermWin.width;
520 } 607 }
521 if (height && height - R->szHint.base_height < max_height) { 608 if (height && height - szHint.base_height < max_height) {
522 R->szHint.height = height; 609 szHint.height = height;
523 R->TermWin.height = height - R->szHint.base_height; 610 TermWin.height = height - szHint.base_height;
524 } else { 611 } else {
525 MIN_IT(R->TermWin.height, max_height); 612 MIN_IT(TermWin.height, max_height);
526 R->szHint.height = R->szHint.base_height + R->TermWin.height; 613 szHint.height = szHint.base_height + TermWin.height;
527 } 614 }
528 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 615 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right))
529 R->window_sb_x = R->szHint.width - sb_w; 616 window_sb_x = szHint.width - sb_w;
530 617
531 if (recalc_x) 618 if (recalc_x)
532 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 619 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
533 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 620 - szHint.width - 2 * TermWin.ext_bwidth);
534 if (recalc_y) 621 if (recalc_y)
535 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 622 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
536 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 623 - szHint.height - 2 * TermWin.ext_bwidth);
537 624
538 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 625 TermWin.ncol = TermWin.width / TermWin.fwidth;
539 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 626 TermWin.nrow = TermWin.height / TermWin.fheight;
540 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",
541 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 628 TermWin.ncol, TermWin.nrow, szHint.width,
542 R->szHint.height)); 629 szHint.height));
543 return; 630 return;
544} 631}
545 632
546/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
547/* 634/*
548 * Tell the teletype handler what size the window is. 635 * Tell the teletype handler what size the window is.
549 * Called after a window size change. 636 * Called after a window size change.
550 */ 637 */
551/* EXTPROTO */
552void 638void
553rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 639rxvt_term::tt_winch ()
554{ 640{
555 struct winsize ws; 641 struct winsize ws;
556 642
557 if (fd < 0) 643 if (cmd_fd < 0)
558 return; 644 return;
645
559 ws.ws_col = col; 646 ws.ws_col = TermWin.ncol;
560 ws.ws_row = row; 647 ws.ws_row = TermWin.nrow;
561 ws.ws_xpixel = ws.ws_ypixel = 0; 648 ws.ws_xpixel = ws.ws_ypixel = 0;
562#ifndef DEBUG_SIZE 649#ifndef DEBUG_SIZE
563 (void)ioctl(fd, TIOCSWINSZ, &ws); 650 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
564#else 651#else
565 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 652 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
566 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 653 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
567 }
568# ifdef SIGWINCH 654# ifdef SIGWINCH
569 else if (pid) /* force through to the command */ 655 else if (cmd_pid) /* force through to the command */
570 kill(pid, SIGWINCH); 656 kill (cmd_pid, SIGWINCH);
571# endif 657# endif
572#endif 658#endif
573} 659}
574 660
575/*----------------------------------------------------------------------*/ 661/*----------------------------------------------------------------------*/
… …
688 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 774 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
689 R->PixColors[Color_bg]); 775 R->PixColors[Color_bg]);
690 776
691/* handle Color_BD, scrollbar background, etc. */ 777/* handle Color_BD, scrollbar background, etc. */
692 778
693 rxvt_set_colorfgbg(aR); 779 rxvt_set_colorfgbg (aR);
694 rxvt_recolour_cursor(aR); 780 R->recolour_cursor ();
695/* the only reasonable way to enforce a clean update */ 781/* the only reasonable way to enforce a clean update */
696 rxvt_scr_poweron(aR); 782 rxvt_scr_poweron (aR);
697} 783}
698 784
699#else 785#else
700# define rxvt_set_window_color(aR_ idx,color) ((void)0) 786# define rxvt_set_window_color(aR_ idx,color) ((void)0)
701#endif /* XTERM_COLOR_CHANGE */ 787#endif /* XTERM_COLOR_CHANGE */
702 788
703/* EXTPROTO */
704void 789void
705rxvt_recolour_cursor(pR) 790rxvt_term::recolour_cursor ()
706{ 791{
707 rxvt_color xcol[2];
708
709#if TODO 792#if TODO
793 rxvt_color xcol[2];
794
710 xcol[0] = R->PixColors[Color_pointer]; 795 xcol[0] = PixColors[Color_pointer];
711 xcol[1] = R->PixColors[Color_bg]; 796 xcol[1] = PixColors[Color_bg];
712 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 797 XQueryColors (Xdisplay, XCMAP, xcol, 2);
713 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 798 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
714#endif 799#endif
715} 800}
716 801
717/*----------------------------------------------------------------------*/ 802/*----------------------------------------------------------------------*/
718/* 803/*
… …
778} 863}
779 864
780/* -------------------------------------------------------------------- * 865/* -------------------------------------------------------------------- *
781 * - WINDOW RESIZING - * 866 * - WINDOW RESIZING - *
782 * -------------------------------------------------------------------- */ 867 * -------------------------------------------------------------------- */
783/* EXTPROTO */
784void 868void
785rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 869rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
786 int ignoreparent)
787{ 870{
788 int fix_screen; 871 int fix_screen;
789 872
790#ifdef SMART_RESIZE 873#ifdef SMART_RESIZE
791 int old_width = R->szHint.width, old_height = R->szHint.height; 874 int old_width = szHint.width, old_height = szHint.height;
792#endif 875#endif
793 876
794 rxvt_window_calc(aR_ width, height); 877 window_calc (width, height);
795 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 878 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
796 if (!ignoreparent) { 879 if (!ignoreparent)
880 {
797#ifdef SMART_RESIZE 881#ifdef SMART_RESIZE
798/* 882 /*
799 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 883 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
800 * reposition window on resize depending on placement on screen 884 * reposition window on resize depending on placement on screen
801 */ 885 */
802 int x, y, x1, y1; 886 int x, y, x1, y1;
803 int dx, dy; 887 int dx, dy;
804 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 888 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
805 Window unused_cr; 889 Window unused_cr;
806 890
807 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 891 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
808 0, 0, &x, &y, &unused_cr); 892 0, 0, &x, &y, &unused_cr);
809 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 893 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
810 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 894 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
811 /* 895 /*
812 * 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
813 * our position for handles and decorations. Counter it 897 * our position for handles and decorations. Counter it
814 */ 898 */
815 if (x1 != x || y1 != y) { 899 if (x1 != x || y1 != y) {
816 x -= x1; 900 x -= x1;
817 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 ();
818 } 937 }
819 938
820 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 939 if (menubar_visible (this))
821 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 940 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
822 dx = old_width - R->szHint.width; 941 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
823 dy = old_height - R->szHint.height;
824 942
825 /* Check position of the center of the window */ 943 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
826 if (x < x1) /* left half */ 944 window_vt_y, TermWin_TotalWidth (),
827 dx = 0; 945 TermWin_TotalHeight ());
828 else if (x == x1) /* exact center */ 946#ifdef RXVT_GRAPHICS
829 dx /= 2; 947 if (old_height)
830 if (y < y1) /* top half */ 948 rxvt_Gr_Resize (this, old_width - szHint.base_width,
831 dy = 0;
832 else if (y == y1) /* exact center */
833 dy /= 2;
834
835 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
836 R->szHint.width, R->szHint.height);
837#else
838 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
839 R->szHint.height); 949 old_height - szHint.base_height);
840#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)
841 } 958 {
959 int curr_screen = -1;
960 int old_ncol = prev_ncol;
842 961
843 fix_screen = (R->TermWin.ncol != R->prev_ncol 962 /* scr_reset only works on the primary screen */
844 || R->TermWin.nrow != R->prev_nrow); 963 if (old_height) /* this is not the first time through */
845 if (fix_screen || width != R->old_width || height != R->old_height) { 964 {
846 if (scrollbar_visible(R)) { 965 unsigned int ncol = TermWin.ncol;
847 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 966 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
848 0, scrollbar_TotalWidth(), R->szHint.height); 967 curr_screen = rxvt_scr_change_screen (this, PRIMARY);
849 rxvt_Resize_scrollBar(aR); 968 TermWin.ncol = ncol;
850 } 969 }
851 if (menubar_visible(R))
852 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
853 0, TermWin_TotalWidth(), menuBar_TotalHeight());
854 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
855 R->window_vt_y, TermWin_TotalWidth(),
856 TermWin_TotalHeight());
857#ifdef RXVT_GRAPHICS
858 if (R->old_height)
859 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
860 R->old_height - R->szHint.base_height);
861#endif
862 rxvt_scr_clear(aR);
863#ifdef XPM_BACKGROUND
864 rxvt_resize_pixmap(aR);
865#endif
866 }
867 970
868 if (fix_screen || R->old_height == 0) {
869 int curr_screen = -1;
870 uint16_t old_ncol = R->prev_ncol;
871
872 /* scr_reset only works on the primary screen */
873 if (R->old_height) /* this is not the first time through */
874 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
875 rxvt_scr_reset(aR); 971 scr_reset();
972
876 if (curr_screen >= 0) { /* this is not the first time through */ 973 if (curr_screen >= 0) /* this is not the first time through */
974 {
877 rxvt_scr_change_screen(aR_ curr_screen); 975 rxvt_scr_change_screen (this, curr_screen);
878 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 976 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0);
879 } 977 }
880 } 978 }
881 979
882 R->old_width = R->szHint.width; 980 old_width = szHint.width;
883 R->old_height = R->szHint.height; 981 old_height = szHint.height;
884 982
885#ifdef USE_XIM 983#ifdef USE_XIM
886 rxvt_IMSetStatusPosition(aR); 984 rxvt_IMSetStatusPosition (this);
887#endif 985#endif
888} 986}
889 987
890/* 988/*
891 * 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.
… …
905 height = wattr.height - R->szHint.base_height; 1003 height = wattr.height - R->szHint.base_height;
906 } 1004 }
907 if (width != R->TermWin.width || height != R->TermWin.height) { 1005 if (width != R->TermWin.width || height != R->TermWin.height) {
908 width += R->szHint.base_width; 1006 width += R->szHint.base_width;
909 height += R->szHint.base_height; 1007 height += R->szHint.base_height;
910 rxvt_resize_all_windows(aR_ width, height, 0); 1008 R->resize_all_windows (width, height, 0);
911 } 1009 }
912} 1010}
913 1011
914/* -------------------------------------------------------------------- * 1012/* -------------------------------------------------------------------- *
915 * - X INPUT METHOD ROUTINES - * 1013 * - X INPUT METHOD ROUTINES - *
916 * -------------------------------------------------------------------- */ 1014 * -------------------------------------------------------------------- */
917#ifdef USE_XIM 1015#ifdef USE_XIM
918/* INTPROTO */
919void 1016void
920rxvt_setSize(pR_ XRectangle * size) 1017rxvt_term::set_size (XRectangle *size)
921{ 1018{
922 size->x = R->TermWin.int_bwidth; 1019 size->x = TermWin.int_bwidth;
923 size->y = R->TermWin.int_bwidth; 1020 size->y = TermWin.int_bwidth;
924 size->width = Width2Pixel(R->TermWin.ncol); 1021 size->width = Width2Pixel(TermWin.ncol);
925 size->height = Height2Pixel(R->TermWin.nrow); 1022 size->height = Height2Pixel(TermWin.nrow);
926} 1023}
927 1024
928/* INTPROTO */
929void 1025void
930rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1026rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
931{ 1027{
932 *fg = R->PixColors[Color_fg]; 1028 *fg = PixColors[Color_fg];
933 *bg = R->PixColors[Color_bg]; 1029 *bg = PixColors[Color_bg];
934} 1030}
935 1031
936/* Checking whether input method is running. */ 1032/* Checking whether input method is running. */
937/* INTPROTO */ 1033/* INTPROTO */
938Bool 1034Bool
… …
973 || R->event_type == SelectionNotify 1069 || R->event_type == SelectionNotify
974 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1070 || R->event_type == ButtonRelease || R->event_type == FocusIn)
975 || !rxvt_IMisRunning(aR)) 1071 || !rxvt_IMisRunning(aR))
976 return; 1072 return;
977 1073
978 rxvt_setPosition(aR_ & spot); 1074 R->set_position (&spot);
979 1075
980 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1076 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
981 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1077 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
982 XFree(preedit_attr); 1078 XFree(preedit_attr);
983} 1079}
984 1080
985/* EXTPROTO */
986void 1081void
987rxvt_setTermFontSet(pR_ int idx)
988{
989 char *string;
990 long length;
991 int success = 0;
992
993 if (idx < 0 || idx >= MAX_NFONTS)
994 return;
995}
996
997/* INTPROTO */
998void
999rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1082rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1000 XRectangle * needed_rect) 1083 XRectangle * needed_rect)
1001{ 1084{
1002 int mbh, vtx = 0; 1085 int mbh, vtx = 0;
1003 1086
1004 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1087 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right))
1005 vtx = scrollbar_TotalWidth(); 1088 vtx = scrollbar_TotalWidth();
1089
1006 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1090 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0;
1007 mbh -= R->TermWin.lineSpace; 1091 mbh -= TermWin.lineSpace;
1008 1092
1009 preedit_rect->x = needed_rect->width + vtx; 1093 preedit_rect->x = needed_rect->width + vtx;
1010 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1094 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1011 1095
1012 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1096 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1013 + vtx;
1014 preedit_rect->height = Height2Pixel(1); 1097 preedit_rect->height = Height2Pixel(1);
1015 1098
1016 status_rect->x = vtx; 1099 status_rect->x = vtx;
1017 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1100 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1018 1101
1019 status_rect->width = needed_rect->width ? needed_rect->width 1102 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1020 : Width2Pixel(R->TermWin.ncol + 1);
1021 status_rect->height = Height2Pixel(1); 1103 status_rect->height = Height2Pixel(1);
1022} 1104}
1023 1105
1024/* ARGSUSED */ 1106/* ARGSUSED */
1025/* INTPROTO */ 1107/* INTPROTO */
1026void 1108void
… …
1036 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1118 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1037 rxvt_IMInstantiateCallback, NULL); 1119 rxvt_IMInstantiateCallback, NULL);
1038} 1120}
1039 1121
1040/* 1122/*
1041 * X manual pages and include files don't match on some systems:
1042 * some think this is an XIDProc and others an XIMProc so we can't
1043 * use the first argument - need to update this to be nice for
1044 * both types via some sort of configure detection
1045 */
1046/* ARGSUSED */
1047/* EXTPROTO */
1048void
1049rxvt_IMInstantiateCallback(Display * unused
1050 __attribute__ ((unused)), XPointer client_data
1051 __attribute__ ((unused)), XPointer call_data
1052 __attribute__ ((unused)))
1053{
1054 dR;
1055 int i, found, had_im;
1056 const char *p;
1057 char **s;
1058 char buf[IMBUFSIZ];
1059
1060 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1061 if (R->Input_Context)
1062 return;
1063
1064 found = had_im = 0;
1065 p = R->rs[Rs_inputMethod];
1066 if (p && *p) {
1067 had_im = 1;
1068 s = rxvt_splitcommastring(p);
1069 for (i = 0; s[i]; i++) {
1070 if (*s[i]) {
1071 STRCPY(buf, "@im=");
1072 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1073 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1074 && (rxvt_IM_get_IC(aR) == True)) {
1075 found = 1;
1076 break;
1077 }
1078 }
1079 }
1080 for (i = 0; s[i]; i++)
1081 free(s[i]);
1082 free(s);
1083 }
1084 if (found)
1085 return;
1086
1087/* try with XMODIFIERS env. var. */
1088 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1089 rxvt_IM_get_IC(aR);
1090 return;
1091 }
1092
1093/* try with no modifiers base IF the user didn't specify an IM */
1094 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1095 && rxvt_IM_get_IC(aR) == True)
1096 return;
1097}
1098
1099/*
1100 * 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
1101 * open a suitable preedit type 1124 * open a suitable preedit type
1102 */ 1125 */
1103/* INTPROTO */ 1126static Bool
1104Bool
1105rxvt_IM_get_IC(pR) 1127rxvt_IM_get_IC (pR)
1106{ 1128{
1107 int i, j, found; 1129 int i, j, found;
1108 XIM xim; 1130 XIM xim;
1109 XPoint spot; 1131 XPoint spot;
1110 XRectangle rect, status_rect, needed_rect; 1132 XRectangle rect, status_rect, needed_rect;
… …
1114 XIMStyles *xim_styles; 1136 XIMStyles *xim_styles;
1115 XVaNestedList preedit_attr, status_attr; 1137 XVaNestedList preedit_attr, status_attr;
1116 XIMCallback ximcallback; 1138 XIMCallback ximcallback;
1117 1139
1118 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1140 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1119 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1141 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1120 if (xim == NULL) 1142 if (xim == NULL)
1121 return False; 1143 return False;
1122 1144
1123 xim_styles = NULL; 1145 xim_styles = NULL;
1124 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1146 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1125 || !xim_styles || !xim_styles->count_styles) { 1147 || !xim_styles || !xim_styles->count_styles) {
1126 XCloseIM(xim); 1148 XCloseIM(xim);
1127 return False; 1149 return False;
1128 } 1150 }
1129 1151
… …
1154 return False; 1176 return False;
1155 } 1177 }
1156 1178
1157 ximcallback.callback = rxvt_IMDestroyCallback; 1179 ximcallback.callback = rxvt_IMDestroyCallback;
1158 1180
1159/* 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) */
1160 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1182 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1161 1183
1162 preedit_attr = status_attr = NULL; 1184 preedit_attr = status_attr = NULL;
1163 1185
1164 if (R->input_style & XIMPreeditPosition) { 1186 if (R->input_style & XIMPreeditPosition) {
1165 rxvt_setSize(aR_ & rect); 1187 R->set_size (&rect);
1166 rxvt_setPosition(aR_ & spot); 1188 R->set_position (&spot);
1167 rxvt_setColor(aR_ & fg, &bg); 1189 R->set_color (&fg, &bg);
1168 1190
1169 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1191 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1170 XNSpotLocation, &spot, 1192 XNSpotLocation, &spot,
1171 XNForeground, fg, XNBackground, bg, 1193 XNForeground, fg, XNBackground, bg,
1172 //XNFontSet, R->TermWin.fontset, 1194 //XNFontSet, R->TermWin.fontset,
1173 NULL); 1195 NULL);
1174 } else if (R->input_style & XIMPreeditArea) { 1196 } else if (R->input_style & XIMPreeditArea) {
1175 rxvt_setColor(aR_ & fg, &bg); 1197 R->set_color (&fg, &bg);
1176 1198
1177 /* 1199 /*
1178 * The necessary width of preedit area is unknown 1200 * The necessary width of preedit area is unknown
1179 * until create input context. 1201 * until create input context.
1180 */ 1202 */
1181 needed_rect.width = 0; 1203 needed_rect.width = 0;
1182 1204
1183 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); 1205 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1184 1206
1185 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1207 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1186 XNForeground, fg, XNBackground, bg, 1208 XNForeground, fg, XNBackground, bg,
1187 //XNFontSet, R->TermWin.fontset, 1209 //XNFontSet, R->TermWin.fontset,
1188 NULL); 1210 NULL);
… …
1212 rxvt_IMSetStatusPosition(aR); 1234 rxvt_IMSetStatusPosition(aR);
1213 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1235 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1214 return True; 1236 return True;
1215} 1237}
1216 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
1217/* EXTPROTO */ 1313/* EXTPROTO */
1218void 1314void
1219rxvt_IMSetStatusPosition(pR) 1315rxvt_IMSetStatusPosition(pR)
1220{ 1316{
1221 XRectangle preedit_rect, status_rect, *needed_rect; 1317 XRectangle preedit_rect, status_rect, *needed_rect;
… …
1229/* Getting the necessary width of preedit area */ 1325/* Getting the necessary width of preedit area */
1230 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1326 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1231 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1327 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL);
1232 XFree(status_attr); 1328 XFree(status_attr);
1233 1329
1234 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1330 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1235 1331
1236 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1332 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1237 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1333 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1238 1334
1239 XSetICValues(R->Input_Context, 1335 XSetICValues(R->Input_Context,

Diff Legend

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