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

Diff Legend

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