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

Diff Legend

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