ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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