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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.17 by pcg, Thu Dec 18 13:33:02 2003 UTC

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

Diff Legend

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