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.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.18 by pcg, Fri Dec 19 06:17:03 2003 UTC

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

Diff Legend

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