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.21 by pcg, Thu Jan 29 23:26:01 2004 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.21 2004/01/29 23:26:01 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 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
80#endif
81#ifdef TEXT_BLINK
82 text_blink_ev (this, &rxvt_term::text_blink_cb),
83#endif
84#ifdef POINTER_BLANK
85 pointer_ev (this, &rxvt_term::pointer_cb),
86#endif
87 x_ev (this, &rxvt_term::x_cb),
88 check_ev (this, &rxvt_term::check_cb),
89 incr_ev (this, &rxvt_term::incr_cb),
90 pty_ev (this, &rxvt_term::pty_cb)
91{
92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
93}
94
95rxvt_term::~rxvt_term ()
96{
97 scr_release ();
98
99 free (locale);
100 free (codeset);
101
102#ifndef NO_SETOWNER_TTYDEV
103 rxvt_privileged_ttydev (this, RESTORE);
104#endif
105#ifdef UTMP_SUPPORT
106 rxvt_privileged_utmp (this, RESTORE);
107#endif
108#ifdef USE_XIM
109 if (Input_Context != NULL)
110 {
111 XDestroyIC (Input_Context);
112 Input_Context = NULL;
113 }
114#endif
115
116 if (cmd_fd >= 0)
117 close (cmd_fd);
118
119 if (Xfd >= 0)
120 XCloseDisplay (Xdisplay);
121
122 delete PixColors;
123}
124
125void
126rxvt_term::destroy ()
127{
128 check_ev.stop ();
129 pty_ev.stop ();
130 x_ev.stop ();
131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
135 text_blink_ev.stop ();
136#endif
137#ifdef POINTER_BLANK
138 pointer_ev.stop ();
139#endif
140
141 destroy_ev.start (0);
142}
143
144void
145rxvt_term::destroy_cb (time_watcher &w)
146{
147 SET_R (this);
148
149 delete this;
67} 150}
68 151
69/*----------------------------------------------------------------------*/ 152/*----------------------------------------------------------------------*/
70/* rxvt_init() */ 153/* rxvt_init() */
71/* LIBPROTO */ 154/* LIBPROTO */
72rxvt_t 155rxvt_t
73rxvt_init(int argc, const char *const *argv) 156rxvt_init (int argc, const char *const *argv)
74{ 157{
75 const char **cmd_argv;
76
77 SET_R(new rxvt_term); 158 SET_R (new rxvt_term);
78 dR; 159 dR;
79 160
80 if (rxvt_init_vars(aR) < 0) 161 if (!R->init_vars () || !R->init (argc, argv))
81 { 162 {
82 free(R); 163 delete R;
83 return NULL; 164 return NULL;
84 } 165 }
85 166
86/* 167 return R;
168}
169
170/* EXTPROTO */
171void
172rxvt_init_signals ()
173{
174/* install exit handler for cleanup */
175#if 0
176#ifdef HAVE_ATEXIT
177 atexit(rxvt_clean_exit);
178#else
179#endif
180#endif
181
182 struct sigaction sa;
183
184 sigfillset (&sa.sa_mask);
185 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
186 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
187 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
189 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
190 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
191 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
192
193/* need to trap SIGURG for SVR4 (Unixware) rlogin */
194/* signal (SIGURG, SIG_DFL); */
195
196 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
197 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
198}
199
200bool
201rxvt_term::init (int argc, const char *const *argv)
202{
203 /*
87 * Save and then give up any super-user privileges 204 * Save and then give up any super-user privileges
88 * If we need privileges in any area then we must specifically request it. 205 * If we need privileges in any area then we must specifically request it.
89 * We should only need to be root in these cases: 206 * We should only need to be root in these cases:
90 * 1. write utmp entries on some systems 207 * 1. write utmp entries on some systems
91 * 2. chown tty on some systems 208 * 2. chown tty on some systems
92 */ 209 */
93 rxvt_privileges(aR_ SAVE); 210 rxvt_privileges (this, SAVE);
94 rxvt_privileges(aR_ IGNORE); 211 rxvt_privileges (this, IGNORE);
95 212
96 rxvt_init_secondary(aR); 213 init_secondary ();
97 214
98 cmd_argv = rxvt_init_resources(aR_ argc, argv); 215 const char **cmd_argv = init_resources (argc, argv);
99 216
100 R->x_ev.start (ConnectionNumber (R->Xdisplay), EVENT_READ); 217 set_locale ("");
101 218
102#if (MENUBAR_MAX) 219#if (MENUBAR_MAX)
103 rxvt_menubar_read(aR_ R->rs[Rs_menu]); 220 rxvt_menubar_read (this, rs[Rs_menu]);
104#endif 221#endif
105#ifdef HAVE_SCROLLBARS 222#ifdef HAVE_SCROLLBARS
106 if (R->Options & Opt_scrollBar) 223 if (Options & Opt_scrollBar)
107 scrollbar_setIdle(); /* set existence for size calculations */ 224 scrollBar.setIdle (); /* set existence for size calculations */
108#endif 225#endif
109 226
110 rxvt_Create_Windows(aR_ argc, argv); 227 create_windows (argc, argv);
111 228
112 rxvt_init_xlocale(aR); 229 init_xlocale ();
113 230
114 rxvt_scr_reset(aR); /* initialize screen */ 231 scr_reset (); /* initialize screen */
115#ifdef RXVT_GRAPHICS 232#ifdef RXVT_GRAPHICS
116 rxvt_Gr_reset(aR); /* reset graphics */ 233 rxvt_Gr_reset (this); /* reset graphics */
117#endif 234#endif
118 235
119#if 0 236#if 0
120#ifdef DEBUG_X 237#ifdef DEBUG_X
121 XSynchronize(R->Xdisplay, True); 238 XSynchronize(Xdisplay, True);
122 XSetErrorHandler((XErrorHandler) abort);
123#else
124 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
125#endif 239#endif
126#endif 240#endif
127 241
128#ifdef HAVE_SCROLLBARS 242#ifdef HAVE_SCROLLBARS
129 if (R->Options & Opt_scrollBar) 243 if (Options & Opt_scrollBar)
130 rxvt_Resize_scrollBar(aR); /* create and map scrollbar */ 244 resize_scrollbar (); /* create and map scrollbar */
131#endif 245#endif
132#if (MENUBAR_MAX) 246#if (MENUBAR_MAX)
133 if (menubar_visible(r)) 247 if (menubar_visible(r))
134 XMapWindow(R->Xdisplay, R->menuBar.win); 248 XMapWindow (Xdisplay, menuBar.win);
135#endif 249#endif
136#ifdef TRANSPARENT 250#ifdef TRANSPARENT
137 if (R->Options & Opt_transparent) 251 if (Options & Opt_transparent)
138 { 252 {
139 XSelectInput(R->Xdisplay, Xroot, PropertyChangeMask); 253 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
140 rxvt_check_our_parents(aR); 254 rxvt_check_our_parents (this);
141 } 255 }
142#endif 256#endif
143 XMapWindow(R->Xdisplay, R->TermWin.vt); 257 XMapWindow (Xdisplay, TermWin.vt);
144 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 258 XMapWindow (Xdisplay, TermWin.parent[0]);
145 259
146 rxvt_init_env(aR); 260 init_env ();
147 rxvt_init_command(aR_ cmd_argv); 261 init_command (cmd_argv);
148 262
263 x_ev.start (Xfd, EVENT_READ);
149 R->pty_ev.start (R->cmd_fd, EVENT_READ); 264 pty_ev.start (cmd_fd, EVENT_READ);
150 265
151 return R; 266 check_ev.start ();
267
268 process_x_events ();
269
270 return true;
152} 271}
153 272
154/* ------------------------------------------------------------------------- * 273/* ------------------------------------------------------------------------- *
155 * SIGNAL HANDLING & EXIT HANDLER * 274 * SIGNAL HANDLING & EXIT HANDLER *
156 * ------------------------------------------------------------------------- */ 275 * ------------------------------------------------------------------------- */
… …
160/* ARGSUSED */ 279/* ARGSUSED */
161/* EXTPROTO */ 280/* EXTPROTO */
162RETSIGTYPE 281RETSIGTYPE
163rxvt_Child_signal(int sig __attribute__ ((unused))) 282rxvt_Child_signal(int sig __attribute__ ((unused)))
164{ 283{
165 dR;
166 int pid, save_errno = errno; 284 int pid, save_errno = errno;
167
168 do {
169 errno = 0;
170 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 285 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
286 ;
287 errno = save_errno;
171 288
289#if 0
172 if (pid == R->cmd_pid) 290 if (pid == R->cmd_pid)
173 exit(EXIT_SUCCESS); 291 exit (EXIT_SUCCESS);
174 292#endif
175 errno = save_errno;
176 signal(SIGCHLD, rxvt_Child_signal);
177} 293}
178 294
179/* 295/*
180 * Catch a fatal signal and tidy up before quitting 296 * Catch a fatal signal and tidy up before quitting
181 */ 297 */
… …
195/* INTPROTO */ 311/* INTPROTO */
196int 312int
197rxvt_xerror_handler(const Display * display 313rxvt_xerror_handler(const Display * display
198 __attribute__ ((unused)), const XErrorEvent * event) 314 __attribute__ ((unused)), const XErrorEvent * event)
199{ 315{
200 dR; 316 dR;
201 317
202 if (R->allowedxerror == -1) { 318 if (R->allowedxerror == -1)
203 R->allowedxerror = event->error_code; 319 R->allowedxerror = event->error_code;
204 return 0; /* ignored anyway */ 320 else
205 } 321 {
206 rxvt_print_error("XError: Request: %d . %d, Error: %d", 322 rxvt_print_error("XError: Request: %d . %d, Error: %d",
207 event->request_code, event->minor_code, 323 event->request_code, event->minor_code,
208 event->error_code); 324 event->error_code);
209/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 325
210 exit(EXIT_FAILURE); 326 R->destroy ();
211/* NOTREACHED */ 327 }
328
329 return 0;
212} 330}
213 331
214/*----------------------------------------------------------------------*/ 332/*----------------------------------------------------------------------*/
215/* 333/*
216 * Exit gracefully, clearing the utmp entry and restoring tty attributes 334 * Exit gracefully, clearing the utmp entry and restoring tty attributes
217 * TODO: if debugging, this should free up any known resources if we can 335 * TODO: if debugging, this should free up any known resources if we can
218 */ 336 */
219/* EXTPROTO */ 337/* EXTPROTO */
220void 338void
221rxvt_clean_exit(void) 339rxvt_clean_exit ()
222{ 340{
223 dR; 341 dR;
224 342
225#ifdef DEBUG_SCREEN 343 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} 344}
241 345
242/* ------------------------------------------------------------------------- * 346/* ------------------------------------------------------------------------- *
243 * MEMORY ALLOCATION WRAPPERS * 347 * MEMORY ALLOCATION WRAPPERS *
244 * ------------------------------------------------------------------------- */ 348 * ------------------------------------------------------------------------- */
… …
423/*----------------------------------------------------------------------*/ 527/*----------------------------------------------------------------------*/
424/* 528/*
425 * window size/position calculcations for XSizeHint and other storage. 529 * window size/position calculcations for XSizeHint and other storage.
426 * if width/height are non-zero then override calculated width/height 530 * if width/height are non-zero then override calculated width/height
427 */ 531 */
428/* EXTPROTO */
429void 532void
430rxvt_window_calc(pR_ unsigned int width, unsigned int height) 533rxvt_term::window_calc (unsigned int width, unsigned int height)
431{ 534{
432 short recalc_x, recalc_y; 535 short recalc_x, recalc_y;
433 int x, y, sb_w, mb_h, flags; 536 int x, y, sb_w, mb_h, flags;
434 unsigned int w, h; 537 unsigned int w, h;
435 unsigned int max_width, max_height; 538 unsigned int max_width, max_height;
436 539
437 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
438 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 541 TermWin.ncol, TermWin.nrow, szHint.width,
439 R->szHint.height)); 542 szHint.height));
440 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 543 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
441 R->szHint.win_gravity = NorthWestGravity; 544 szHint.win_gravity = NorthWestGravity;
442/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 545/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
443 546
444 recalc_x = recalc_y = 0; 547 recalc_x = recalc_y = 0;
445 flags = 0; 548 flags = 0;
446 if (!R->parsed_geometry) { 549 if (!parsed_geometry) {
447 R->parsed_geometry = 1; 550 parsed_geometry = 1;
448 if (R->rs[Rs_geometry]) 551 if (rs[Rs_geometry])
449 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 552 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
450 if (flags & WidthValue) { 553 if (flags & WidthValue) {
451 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 554 TermWin.ncol = BOUND_POSITIVE_INT16(w);
452 R->szHint.flags |= USSize; 555 szHint.flags |= USSize;
453 } 556 }
454 if (flags & HeightValue) { 557 if (flags & HeightValue) {
455 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 558 TermWin.nrow = BOUND_POSITIVE_INT16(h);
456 R->szHint.flags |= USSize; 559 szHint.flags |= USSize;
457 } 560 }
458 if (flags & XValue) { 561 if (flags & XValue) {
459 R->szHint.x = x; 562 szHint.x = x;
460 R->szHint.flags |= USPosition; 563 szHint.flags |= USPosition;
461 if (flags & XNegative) { 564 if (flags & XNegative) {
462 recalc_x = 1; 565 recalc_x = 1;
463 R->szHint.win_gravity = NorthEastGravity; 566 szHint.win_gravity = NorthEastGravity;
464 } 567 }
465 } 568 }
466 if (flags & YValue) { 569 if (flags & YValue) {
467 R->szHint.y = y; 570 szHint.y = y;
468 R->szHint.flags |= USPosition; 571 szHint.flags |= USPosition;
469 if (flags & YNegative) { 572 if (flags & YNegative) {
470 recalc_y = 1; 573 recalc_y = 1;
471 if (R->szHint.win_gravity == NorthEastGravity) 574 if (szHint.win_gravity == NorthEastGravity)
472 R->szHint.win_gravity = SouthEastGravity; 575 szHint.win_gravity = SouthEastGravity;
473 else 576 else
474 R->szHint.win_gravity = SouthWestGravity; 577 szHint.win_gravity = SouthWestGravity;
475 } 578 }
476 } 579 }
477 } 580 }
478/* TODO: BOUNDS */ 581/* TODO: BOUNDS */
479 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 582 TermWin.width = TermWin.ncol * TermWin.fwidth;
480 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 583 TermWin.height = TermWin.nrow * TermWin.fheight;
481 max_width = MAX_COLS * R->TermWin.fwidth; 584 max_width = MAX_COLS * TermWin.fwidth;
482 max_height = MAX_ROWS * R->TermWin.fheight; 585 max_height = MAX_ROWS * TermWin.fheight;
483 586
484 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
485 588
486 sb_w = mb_h = 0; 589 sb_w = mb_h = 0;
487 R->window_vt_x = R->window_vt_y = 0; 590 window_vt_x = window_vt_y = 0;
488 if (scrollbar_visible(R)) { 591 if (scrollbar_visible (this)) {
489 sb_w = scrollbar_TotalWidth(); 592 sb_w = scrollbar_TotalWidth();
490 R->szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
491 if (!(R->Options & Opt_scrollBar_right)) 594 if (!(Options & Opt_scrollBar_right))
492 R->window_vt_x = sb_w; 595 window_vt_x = sb_w;
493 } 596 }
494 if (menubar_visible(R)) { 597 if (menubar_visible (this)) {
495 mb_h = menuBar_TotalHeight(); 598 mb_h = menuBar_TotalHeight();
496 R->szHint.base_height += mb_h; 599 szHint.base_height += mb_h;
497 R->window_vt_y = mb_h; 600 window_vt_y = mb_h;
498 } 601 }
499 R->szHint.width_inc = R->TermWin.fwidth; 602 szHint.width_inc = TermWin.fwidth;
500 R->szHint.height_inc = R->TermWin.fheight; 603 szHint.height_inc = TermWin.fheight;
501 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 604 szHint.min_width = szHint.base_width + szHint.width_inc;
502 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 605 szHint.min_height = szHint.base_height + szHint.height_inc;
503 606
504 if (width && width - R->szHint.base_width < max_width) { 607 if (width && width - szHint.base_width < max_width) {
505 R->szHint.width = width; 608 szHint.width = width;
506 R->TermWin.width = width - R->szHint.base_width; 609 TermWin.width = width - szHint.base_width;
507 } else { 610 } else {
508 MIN_IT(R->TermWin.width, max_width); 611 MIN_IT(TermWin.width, max_width);
509 R->szHint.width = R->szHint.base_width + R->TermWin.width; 612 szHint.width = szHint.base_width + TermWin.width;
510 } 613 }
511 if (height && height - R->szHint.base_height < max_height) { 614 if (height && height - szHint.base_height < max_height) {
512 R->szHint.height = height; 615 szHint.height = height;
513 R->TermWin.height = height - R->szHint.base_height; 616 TermWin.height = height - szHint.base_height;
514 } else { 617 } else {
515 MIN_IT(R->TermWin.height, max_height); 618 MIN_IT(TermWin.height, max_height);
516 R->szHint.height = R->szHint.base_height + R->TermWin.height; 619 szHint.height = szHint.base_height + TermWin.height;
517 } 620 }
518 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 621 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right))
519 R->window_sb_x = R->szHint.width - sb_w; 622 window_sb_x = szHint.width - sb_w;
520 623
521 if (recalc_x) 624 if (recalc_x)
522 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 625 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
523 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 626 - szHint.width - 2 * TermWin.ext_bwidth);
524 if (recalc_y) 627 if (recalc_y)
525 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 628 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
526 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 629 - szHint.height - 2 * TermWin.ext_bwidth);
527 630
528 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 631 TermWin.ncol = TermWin.width / TermWin.fwidth;
529 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 632 TermWin.nrow = TermWin.height / TermWin.fheight;
530 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
531 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 634 TermWin.ncol, TermWin.nrow, szHint.width,
532 R->szHint.height)); 635 szHint.height));
533 return; 636 return;
534} 637}
535 638
536/*----------------------------------------------------------------------*/ 639/*----------------------------------------------------------------------*/
537/* 640/*
538 * Tell the teletype handler what size the window is. 641 * Tell the teletype handler what size the window is.
539 * Called after a window size change. 642 * Called after a window size change.
540 */ 643 */
541/* EXTPROTO */
542void 644void
543rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 645rxvt_term::tt_winch ()
544{ 646{
545 struct winsize ws; 647 struct winsize ws;
546 648
547 if (fd < 0) 649 if (cmd_fd < 0)
548 return; 650 return;
651
549 ws.ws_col = col; 652 ws.ws_col = TermWin.ncol;
550 ws.ws_row = row; 653 ws.ws_row = TermWin.nrow;
551 ws.ws_xpixel = ws.ws_ypixel = 0; 654 ws.ws_xpixel = ws.ws_ypixel = 0;
552#ifndef DEBUG_SIZE 655#ifndef DEBUG_SIZE
553 (void)ioctl(fd, TIOCSWINSZ, &ws); 656 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
554#else 657#else
555 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 658 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
556 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 659 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
557 }
558# ifdef SIGWINCH 660# ifdef SIGWINCH
559 else if (pid) /* force through to the command */ 661 else if (cmd_pid) /* force through to the command */
560 kill(pid, SIGWINCH); 662 kill (cmd_pid, SIGWINCH);
561# endif 663# endif
562#endif 664#endif
563} 665}
564 666
565/*----------------------------------------------------------------------*/ 667/*----------------------------------------------------------------------*/
… …
678 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
679 R->PixColors[Color_bg]); 781 R->PixColors[Color_bg]);
680 782
681/* handle Color_BD, scrollbar background, etc. */ 783/* handle Color_BD, scrollbar background, etc. */
682 784
683 rxvt_set_colorfgbg(aR); 785 rxvt_set_colorfgbg (aR);
684 rxvt_recolour_cursor(aR); 786 R->recolour_cursor ();
685/* the only reasonable way to enforce a clean update */ 787/* the only reasonable way to enforce a clean update */
686 rxvt_scr_poweron(aR); 788 rxvt_scr_poweron (aR);
687} 789}
688 790
689#else 791#else
690# define rxvt_set_window_color(aR_ idx,color) ((void)0) 792# define rxvt_set_window_color(aR_ idx,color) ((void)0)
691#endif /* XTERM_COLOR_CHANGE */ 793#endif /* XTERM_COLOR_CHANGE */
692 794
693/* EXTPROTO */
694void 795void
695rxvt_recolour_cursor(pR) 796rxvt_term::recolour_cursor ()
696{ 797{
697 rxvt_color xcol[2];
698
699#if TODO 798#if TODO
799 rxvt_color xcol[2];
800
700 xcol[0] = R->PixColors[Color_pointer]; 801 xcol[0] = PixColors[Color_pointer];
701 xcol[1] = R->PixColors[Color_bg]; 802 xcol[1] = PixColors[Color_bg];
702 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 803 XQueryColors (Xdisplay, XCMAP, xcol, 2);
703 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 804 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
704#endif 805#endif
705} 806}
706 807
707/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
708/* 809/*
… …
768} 869}
769 870
770/* -------------------------------------------------------------------- * 871/* -------------------------------------------------------------------- *
771 * - WINDOW RESIZING - * 872 * - WINDOW RESIZING - *
772 * -------------------------------------------------------------------- */ 873 * -------------------------------------------------------------------- */
773/* EXTPROTO */
774void 874void
775rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 875rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
776 int ignoreparent)
777{ 876{
778 int fix_screen; 877 int fix_screen;
779 878
780#ifdef SMART_RESIZE 879#ifdef SMART_RESIZE
781 int old_width = R->szHint.width, old_height = R->szHint.height; 880 int old_width = szHint.width, old_height = szHint.height;
782#endif 881#endif
783 882
784 rxvt_window_calc(aR_ width, height); 883 window_calc (width, height);
785 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 884 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
786 if (!ignoreparent) { 885 if (!ignoreparent)
886 {
787#ifdef SMART_RESIZE 887#ifdef SMART_RESIZE
788/* 888 /*
789 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 889 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
790 * reposition window on resize depending on placement on screen 890 * reposition window on resize depending on placement on screen
791 */ 891 */
792 int x, y, x1, y1; 892 int x, y, x1, y1;
793 int dx, dy; 893 int dx, dy;
794 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 894 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
795 Window unused_cr; 895 Window unused_cr;
796 896
797 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 897 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
798 0, 0, &x, &y, &unused_cr); 898 0, 0, &x, &y, &unused_cr);
799 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 899 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
800 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 900 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
801 /* 901 /*
802 * if Xroot isn't the parent window, a WM will probably have offset 902 * if Xroot isn't the parent window, a WM will probably have offset
803 * our position for handles and decorations. Counter it 903 * our position for handles and decorations. Counter it
804 */ 904 */
805 if (x1 != x || y1 != y) { 905 if (x1 != x || y1 != y) {
806 x -= x1; 906 x -= x1;
807 y -= y1; 907 y -= y1;
908 }
909
910 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
911 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
912 dx = old_width - szHint.width;
913 dy = old_height - szHint.height;
914
915 /* Check position of the center of the window */
916 if (x < x1) /* left half */
917 dx = 0;
918 else if (x == x1) /* exact center */
919 dx /= 2;
920 if (y < y1) /* top half */
921 dy = 0;
922 else if (y == y1) /* exact center */
923 dy /= 2;
924
925 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
926 szHint.width, szHint.height);
927#else
928 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
929 szHint.height);
930#endif
931 }
932
933 fix_screen = (TermWin.ncol != prev_ncol
934 || TermWin.nrow != prev_nrow);
935
936 if (fix_screen || width != old_width || height != old_height)
937 {
938 if (scrollbar_visible (this))
939 {
940 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
941 0, scrollbar_TotalWidth (), szHint.height);
942 resize_scrollbar ();
808 } 943 }
809 944
810 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 945 if (menubar_visible (this))
811 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 946 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
812 dx = old_width - R->szHint.width; 947 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
813 dy = old_height - R->szHint.height;
814 948
815 /* Check position of the center of the window */ 949 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
816 if (x < x1) /* left half */ 950 window_vt_y, TermWin_TotalWidth (),
817 dx = 0; 951 TermWin_TotalHeight ());
818 else if (x == x1) /* exact center */ 952#ifdef RXVT_GRAPHICS
819 dx /= 2; 953 if (old_height)
820 if (y < y1) /* top half */ 954 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); 955 old_height - szHint.base_height);
830#endif 956#endif
957 scr_clear ();
958#ifdef XPM_BACKGROUND
959 rxvt_resize_pixmap (this);
960#endif
961 }
962
963 if (fix_screen || old_height == 0)
831 } 964 {
965 int curr_screen = -1;
966 int old_ncol = prev_ncol;
832 967
833 fix_screen = (R->TermWin.ncol != R->prev_ncol 968 /* scr_reset only works on the primary screen */
834 || R->TermWin.nrow != R->prev_nrow); 969 if (old_height) /* this is not the first time through */
835 if (fix_screen || width != R->old_width || height != R->old_height) { 970 {
836 if (scrollbar_visible(R)) { 971 unsigned int ncol = TermWin.ncol;
837 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 972 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
838 0, scrollbar_TotalWidth(), R->szHint.height); 973 curr_screen = rxvt_scr_change_screen (this, PRIMARY);
839 rxvt_Resize_scrollBar(aR); 974 TermWin.ncol = ncol;
840 } 975 }
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 976
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); 977 scr_reset();
978
866 if (curr_screen >= 0) { /* this is not the first time through */ 979 if (curr_screen >= 0) /* this is not the first time through */
980 {
867 rxvt_scr_change_screen(aR_ curr_screen); 981 rxvt_scr_change_screen (this, curr_screen);
868 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 982 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0);
869 } 983 }
870 } 984 }
871 985
872 R->old_width = R->szHint.width; 986 old_width = szHint.width;
873 R->old_height = R->szHint.height; 987 old_height = szHint.height;
874 988
875#ifdef USE_XIM 989#ifdef USE_XIM
876 rxvt_IMSetStatusPosition(aR); 990 rxvt_IMSetStatusPosition (this);
877#endif 991#endif
878} 992}
879 993
880/* 994/*
881 * Set the width/height of the vt window in characters. Units are pixels. 995 * Set the width/height of the vt window in characters. Units are pixels.
… …
895 height = wattr.height - R->szHint.base_height; 1009 height = wattr.height - R->szHint.base_height;
896 } 1010 }
897 if (width != R->TermWin.width || height != R->TermWin.height) { 1011 if (width != R->TermWin.width || height != R->TermWin.height) {
898 width += R->szHint.base_width; 1012 width += R->szHint.base_width;
899 height += R->szHint.base_height; 1013 height += R->szHint.base_height;
900 rxvt_resize_all_windows(aR_ width, height, 0); 1014 R->resize_all_windows (width, height, 0);
901 } 1015 }
902} 1016}
903 1017
904/* -------------------------------------------------------------------- * 1018/* -------------------------------------------------------------------- *
905 * - X INPUT METHOD ROUTINES - * 1019 * - X INPUT METHOD ROUTINES - *
906 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
907#ifdef USE_XIM 1021#ifdef USE_XIM
908/* INTPROTO */
909void 1022void
910rxvt_setSize(pR_ XRectangle * size) 1023rxvt_term::set_size (XRectangle *size)
911{ 1024{
912 size->x = R->TermWin.int_bwidth; 1025 size->x = TermWin.int_bwidth;
913 size->y = R->TermWin.int_bwidth; 1026 size->y = TermWin.int_bwidth;
914 size->width = Width2Pixel(R->TermWin.ncol); 1027 size->width = Width2Pixel(TermWin.ncol);
915 size->height = Height2Pixel(R->TermWin.nrow); 1028 size->height = Height2Pixel(TermWin.nrow);
916} 1029}
917 1030
918/* INTPROTO */
919void 1031void
920rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1032rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
921{ 1033{
922 *fg = R->PixColors[Color_fg]; 1034 *fg = PixColors[Color_fg];
923 *bg = R->PixColors[Color_bg]; 1035 *bg = PixColors[Color_bg];
924} 1036}
925 1037
926/* Checking whether input method is running. */ 1038/* Checking whether input method is running. */
927/* INTPROTO */ 1039/* INTPROTO */
928Bool 1040Bool
… …
963 || R->event_type == SelectionNotify 1075 || R->event_type == SelectionNotify
964 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1076 || R->event_type == ButtonRelease || R->event_type == FocusIn)
965 || !rxvt_IMisRunning(aR)) 1077 || !rxvt_IMisRunning(aR))
966 return; 1078 return;
967 1079
968 rxvt_setPosition(aR_ & spot); 1080 R->set_position (&spot);
969 1081
970 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1082 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
971 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1083 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
972 XFree(preedit_attr); 1084 XFree(preedit_attr);
973} 1085}
974 1086
975/* EXTPROTO */
976void 1087void
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, 1088rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
990 XRectangle * needed_rect) 1089 XRectangle * needed_rect)
991{ 1090{
992 int mbh, vtx = 0; 1091 int mbh, vtx = 0;
993 1092
994 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1093 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right))
995 vtx = scrollbar_TotalWidth(); 1094 vtx = scrollbar_TotalWidth();
1095
996 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1096 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0;
997 mbh -= R->TermWin.lineSpace; 1097 mbh -= TermWin.lineSpace;
998 1098
999 preedit_rect->x = needed_rect->width + vtx; 1099 preedit_rect->x = needed_rect->width + vtx;
1000 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1100 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1001 1101
1002 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1102 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1003 + vtx;
1004 preedit_rect->height = Height2Pixel(1); 1103 preedit_rect->height = Height2Pixel(1);
1005 1104
1006 status_rect->x = vtx; 1105 status_rect->x = vtx;
1007 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1106 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1008 1107
1009 status_rect->width = needed_rect->width ? needed_rect->width 1108 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); 1109 status_rect->height = Height2Pixel(1);
1012} 1110}
1013 1111
1014/* ARGSUSED */ 1112/* ARGSUSED */
1015/* INTPROTO */ 1113/* INTPROTO */
1016void 1114void
… …
1026 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1124 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1027 rxvt_IMInstantiateCallback, NULL); 1125 rxvt_IMInstantiateCallback, NULL);
1028} 1126}
1029 1127
1030/* 1128/*
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 1129 * Try to open a XIM with the current modifiers, then see if we can
1091 * open a suitable preedit type 1130 * open a suitable preedit type
1092 */ 1131 */
1093/* INTPROTO */ 1132static Bool
1094Bool
1095rxvt_IM_get_IC(pR) 1133rxvt_IM_get_IC (pR)
1096{ 1134{
1097 int i, j, found; 1135 int i, j, found;
1098 XIM xim; 1136 XIM xim;
1099 XPoint spot; 1137 XPoint spot;
1100 XRectangle rect, status_rect, needed_rect; 1138 XRectangle rect, status_rect, needed_rect;
… …
1104 XIMStyles *xim_styles; 1142 XIMStyles *xim_styles;
1105 XVaNestedList preedit_attr, status_attr; 1143 XVaNestedList preedit_attr, status_attr;
1106 XIMCallback ximcallback; 1144 XIMCallback ximcallback;
1107 1145
1108 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1146 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1109 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1147 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1110 if (xim == NULL) 1148 if (xim == NULL)
1111 return False; 1149 return False;
1112 1150
1113 xim_styles = NULL; 1151 xim_styles = NULL;
1114 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1152 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1115 || !xim_styles || !xim_styles->count_styles) { 1153 || !xim_styles || !xim_styles->count_styles) {
1116 XCloseIM(xim); 1154 XCloseIM(xim);
1117 return False; 1155 return False;
1118 } 1156 }
1119 1157
… …
1144 return False; 1182 return False;
1145 } 1183 }
1146 1184
1147 ximcallback.callback = rxvt_IMDestroyCallback; 1185 ximcallback.callback = rxvt_IMDestroyCallback;
1148 1186
1149/* XXX: not sure why we need this (as well as IC one below) */ 1187 /* XXX: not sure why we need this (as well as IC one below) */
1150 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1188 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1151 1189
1152 preedit_attr = status_attr = NULL; 1190 preedit_attr = status_attr = NULL;
1153 1191
1154 if (R->input_style & XIMPreeditPosition) { 1192 if (R->input_style & XIMPreeditPosition) {
1155 rxvt_setSize(aR_ & rect); 1193 R->set_size (&rect);
1156 rxvt_setPosition(aR_ & spot); 1194 R->set_position (&spot);
1157 rxvt_setColor(aR_ & fg, &bg); 1195 R->set_color (&fg, &bg);
1158 1196
1159 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1197 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1160 XNSpotLocation, &spot, 1198 XNSpotLocation, &spot,
1161 XNForeground, fg, XNBackground, bg, 1199 XNForeground, fg, XNBackground, bg,
1162 //XNFontSet, R->TermWin.fontset, 1200 //XNFontSet, R->TermWin.fontset,
1163 NULL); 1201 NULL);
1164 } else if (R->input_style & XIMPreeditArea) { 1202 } else if (R->input_style & XIMPreeditArea) {
1165 rxvt_setColor(aR_ & fg, &bg); 1203 R->set_color (&fg, &bg);
1166 1204
1167 /* 1205 /*
1168 * The necessary width of preedit area is unknown 1206 * The necessary width of preedit area is unknown
1169 * until create input context. 1207 * until create input context.
1170 */ 1208 */
1171 needed_rect.width = 0; 1209 needed_rect.width = 0;
1172 1210
1173 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); 1211 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1174 1212
1175 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1213 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1176 XNForeground, fg, XNBackground, bg, 1214 XNForeground, fg, XNBackground, bg,
1177 //XNFontSet, R->TermWin.fontset, 1215 //XNFontSet, R->TermWin.fontset,
1178 NULL); 1216 NULL);
… …
1202 rxvt_IMSetStatusPosition(aR); 1240 rxvt_IMSetStatusPosition(aR);
1203 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1241 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1204 return True; 1242 return True;
1205} 1243}
1206 1244
1245/*
1246 * X manual pages and include files don't match on some systems:
1247 * some think this is an XIDProc and others an XIMProc so we can't
1248 * use the first argument - need to update this to be nice for
1249 * both types via some sort of configure detection
1250 */
1251/* ARGSUSED */
1252/* EXTPROTO */
1253void
1254rxvt_IMInstantiateCallback(Display * unused
1255 __attribute__ ((unused)), XPointer client_data
1256 __attribute__ ((unused)), XPointer call_data
1257 __attribute__ ((unused)))
1258{
1259 dR;
1260 int i, found, had_im;
1261 const char *p;
1262 char **s;
1263 char buf[IMBUFSIZ];
1264
1265 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1266 if (R->Input_Context)
1267 return;
1268
1269#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1270 if (R->rs[Rs_imLocale])
1271 setlocale (LC_CTYPE, R->rs[Rs_imLocale]);
1272#endif
1273
1274 p = R->rs[Rs_inputMethod];
1275 if (p && *p)
1276 {
1277 bool found = false;
1278
1279 s = rxvt_splitcommastring (p);
1280 for (i = 0; s[i]; i++)
1281 {
1282 if (*s[i])
1283 {
1284 STRCPY (buf, "@im=");
1285 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1286 if ((p = XSetLocaleModifiers (buf)) && *p
1287 && rxvt_IM_get_IC (aR))
1288 {
1289 found = true;
1290 break;
1291 }
1292 }
1293 }
1294 for (i = 0; s[i]; i++)
1295 free(s[i]);
1296 free(s);
1297
1298 if (found)
1299 goto done;
1300 }
1301
1302/* try with XMODIFIERS env. var. */
1303 if ((p = XSetLocaleModifiers ("")) && *p
1304 && rxvt_IM_get_IC (aR))
1305 goto done;
1306
1307/* try with no modifiers base IF the user didn't specify an IM */
1308 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1309 && rxvt_IM_get_IC (aR) == True)
1310 goto done;
1311
1312done:
1313#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1314 if (R->rs[Rs_imLocale])
1315 setlocale (LC_CTYPE, R->locale);
1316#endif
1317}
1318
1207/* EXTPROTO */ 1319/* EXTPROTO */
1208void 1320void
1209rxvt_IMSetStatusPosition(pR) 1321rxvt_IMSetStatusPosition(pR)
1210{ 1322{
1211 XRectangle preedit_rect, status_rect, *needed_rect; 1323 XRectangle preedit_rect, status_rect, *needed_rect;
… …
1219/* Getting the necessary width of preedit area */ 1331/* Getting the necessary width of preedit area */
1220 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1332 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1221 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1333 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL);
1222 XFree(status_attr); 1334 XFree(status_attr);
1223 1335
1224 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1336 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1225 1337
1226 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1338 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1227 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1339 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1228 1340
1229 XSetICValues(R->Input_Context, 1341 XSetICValues(R->Input_Context,

Diff Legend

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