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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.25 by pcg, Sat Jan 31 03:27:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.15 2003/12/18 05:45:11 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * 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> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
49static char curlocale[128]; 48static char curlocale[128];
50 49
51void 50void
52rxvt_set_locale (const char *locale) 51rxvt_set_locale (const char *locale)
53{ 52{
54 if (locale && strncmp (locale, curlocale, 128)) 53 if (locale && STRNCMP (locale, curlocale, 128))
55 { 54 {
56 strncpy (curlocale, locale, 128); 55 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 56 setlocale (LC_CTYPE, curlocale);
58 } 57 }
59} 58}
60 59
61void * 60void *
… …
72{ 71{
73 free (p); 72 free (p);
74} 73}
75 74
76rxvt_term::rxvt_term () 75rxvt_term::rxvt_term ()
77: pty_ev (this, &rxvt_term::pty_cb), 76:
78#ifdef CURSOR_BLINK 77#ifdef CURSOR_BLINK
78 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
79#endif
80#ifdef TEXT_BLINK
79 blink_ev (this, &rxvt_term::blink_cb), 81 text_blink_ev (this, &rxvt_term::text_blink_cb),
80#endif 82#endif
81#ifdef POINTER_BLANK 83#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb), 84 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif 85#endif
84 x_ev (this, &rxvt_term::x_cb), 86 check_ev (this, &rxvt_term::check_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb), 87 destroy_ev (this, &rxvt_term::destroy_cb),
88 pty_ev (this, &rxvt_term::pty_cb),
86 check_ev (this, &rxvt_term::check_cb), 89 x_ev (this, &rxvt_term::x_cb),
87 incr_ev (this, &rxvt_term::incr_cb) 90 incr_ev (this, &rxvt_term::incr_cb)
88{ 91{
89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
90} 93}
91 94
92rxvt_term::~rxvt_term () 95rxvt_term::~rxvt_term ()
… …
95 98
96 free (locale); 99 free (locale);
97 free (codeset); 100 free (codeset);
98 101
99#ifndef NO_SETOWNER_TTYDEV 102#ifndef NO_SETOWNER_TTYDEV
100 rxvt_privileged_ttydev (this, RESTORE); 103 privileged_ttydev (RESTORE);
101#endif 104#endif
102#ifdef UTMP_SUPPORT 105#ifdef UTMP_SUPPORT
103 rxvt_privileged_utmp (this, RESTORE); 106 privileged_utmp (RESTORE);
104#endif 107#endif
105#ifdef USE_XIM 108#ifdef USE_XIM
106 if (Input_Context != NULL) 109 if (Input_Context != NULL)
107 { 110 {
108 XDestroyIC (Input_Context); 111 XDestroyIC (Input_Context);
… …
124{ 127{
125 check_ev.stop (); 128 check_ev.stop ();
126 pty_ev.stop (); 129 pty_ev.stop ();
127 x_ev.stop (); 130 x_ev.stop ();
128#ifdef CURSOR_BLINK 131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
129 blink_ev.stop (); 135 text_blink_ev.stop ();
130#endif 136#endif
131#ifdef POINTER_BLANK 137#ifdef POINTER_BLANK
132 pointer_ev.stop (); 138 pointer_ev.stop ();
133#endif 139#endif
134 140
… …
148/* LIBPROTO */ 154/* LIBPROTO */
149rxvt_t 155rxvt_t
150rxvt_init (int argc, const char *const *argv) 156rxvt_init (int argc, const char *const *argv)
151{ 157{
152 SET_R (new rxvt_term); 158 SET_R (new rxvt_term);
153 dR;
154 159
155 if (!R->init_vars () || !R->init (argc, argv)) 160 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
156 { 161 {
157 delete R; 162 delete GET_R;
158 return NULL; 163 SET_R (0);
159 } 164 }
160 165
161 return R; 166 return GET_R;
162} 167}
163 168
164/* EXTPROTO */
165void 169void
166rxvt_init_signals () 170rxvt_init_signals ()
167{ 171{
168/* install exit handler for cleanup */ 172/* install exit handler for cleanup */
169#if 0 173#if 0
… …
199 * If we need privileges in any area then we must specifically request it. 203 * If we need privileges in any area then we must specifically request it.
200 * We should only need to be root in these cases: 204 * We should only need to be root in these cases:
201 * 1. write utmp entries on some systems 205 * 1. write utmp entries on some systems
202 * 2. chown tty on some systems 206 * 2. chown tty on some systems
203 */ 207 */
204 rxvt_privileges (this, SAVE); 208 privileges (SAVE);
205 rxvt_privileges (this, IGNORE); 209 privileges (IGNORE);
206
207#if HAVE_XSETLOCALE || HAVE_SETLOCALE
208 locale = strdup (setlocale (LC_CTYPE, ""));
209#endif
210#if HAVE_NL_LANGINFO
211 codeset = strdup (nl_langinfo (CODESET));
212#endif
213 210
214 init_secondary (); 211 init_secondary ();
215 212
216 const char **cmd_argv = init_resources (argc, argv); 213 const char **cmd_argv = init_resources (argc, argv);
217 214
215 set_locale ("");
216
218#if (MENUBAR_MAX) 217#if (MENUBAR_MAX)
219 rxvt_menubar_read (this, rs[Rs_menu]); 218 menubar_read (rs[Rs_menu]);
220#endif 219#endif
221#ifdef HAVE_SCROLLBARS 220#ifdef HAVE_SCROLLBARS
222 if (Options & Opt_scrollBar) 221 if (Options & Opt_scrollBar)
223 scrollBar.setIdle (); /* set existence for size calculations */ 222 scrollBar.setIdle (); /* set existence for size calculations */
224#endif 223#endif
225 224
226 rxvt_Create_Windows (this, argc, argv); 225 create_windows (argc, argv);
227 226
228 init_xlocale (); 227 init_xlocale ();
229 228
230 scr_reset (); /* initialize screen */ 229 scr_reset (); /* initialize screen */
231#ifdef RXVT_GRAPHICS 230#ifdef RXVT_GRAPHICS
232 rxvt_Gr_reset (this); /* reset graphics */ 231 Gr_reset (); /* reset graphics */
233#endif 232#endif
234 233
235#if 0 234#if 0
236#ifdef DEBUG_X 235#ifdef DEBUG_X
237 XSynchronize(Xdisplay, True); 236 XSynchronize(Xdisplay, True);
238#endif 237#endif
239#endif 238#endif
240 239
241#ifdef HAVE_SCROLLBARS 240#ifdef HAVE_SCROLLBARS
242 if (Options & Opt_scrollBar) 241 if (Options & Opt_scrollBar)
243 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 242 resize_scrollbar (); /* create and map scrollbar */
244#endif 243#endif
245#if (MENUBAR_MAX) 244#if (MENUBAR_MAX)
246 if (menubar_visible(r)) 245 if (menubar_visible(r))
247 XMapWindow (Xdisplay, menuBar.win); 246 XMapWindow (Xdisplay, menuBar.win);
248#endif 247#endif
249#ifdef TRANSPARENT 248#ifdef TRANSPARENT
250 if (Options & Opt_transparent) 249 if (Options & Opt_transparent)
251 { 250 {
252 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 251 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
253 rxvt_check_our_parents (this); 252 check_our_parents ();
254 } 253 }
255#endif 254#endif
256 XMapWindow (Xdisplay, TermWin.vt); 255 XMapWindow (Xdisplay, TermWin.vt);
257 XMapWindow (Xdisplay, TermWin.parent[0]); 256 XMapWindow (Xdisplay, TermWin.parent[0]);
258 257
… …
284 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 283 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
285 ; 284 ;
286 errno = save_errno; 285 errno = save_errno;
287 286
288#if 0 287#if 0
289 if (pid == R->cmd_pid) 288 if (pid == cmd_pid)
290 exit (EXIT_SUCCESS); 289 exit (EXIT_SUCCESS);
291#endif 290#endif
292} 291}
293 292
294/* 293/*
… …
305 rxvt_clean_exit(); 304 rxvt_clean_exit();
306 kill(getpid(), sig); 305 kill(getpid(), sig);
307} 306}
308 307
309/* ARGSUSED */ 308/* ARGSUSED */
310/* INTPROTO */ 309/* EXTPROTO */
311int 310int
312rxvt_xerror_handler(const Display * display 311rxvt_xerror_handler(const Display * display
313 __attribute__ ((unused)), const XErrorEvent * event) 312 __attribute__ ((unused)), const XErrorEvent * event)
314{ 313{
315 dR;
316
317 if (R->allowedxerror == -1) 314 if (GET_R->allowedxerror == -1)
318 R->allowedxerror = event->error_code; 315 GET_R->allowedxerror = event->error_code;
319 else 316 else
320 { 317 {
321 rxvt_print_error("XError: Request: %d . %d, Error: %d", 318 rxvt_print_error("XError: Request: %d . %d, Error: %d",
322 event->request_code, event->minor_code, 319 event->request_code, event->minor_code,
323 event->error_code); 320 event->error_code);
324 321
325 R->destroy (); 322 GET_R->destroy ();
326 } 323 }
327 324
328 return 0; 325 return 0;
329} 326}
330 327
… …
335 */ 332 */
336/* EXTPROTO */ 333/* EXTPROTO */
337void 334void
338rxvt_clean_exit () 335rxvt_clean_exit ()
339{ 336{
340 dR;
341
342 R->destroy (); 337 GET_R->destroy ();
343} 338}
344 339
345/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
346 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
347 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
… …
398 393
399/* ------------------------------------------------------------------------- * 394/* ------------------------------------------------------------------------- *
400 * PRIVILEGED OPERATIONS * 395 * PRIVILEGED OPERATIONS *
401 * ------------------------------------------------------------------------- */ 396 * ------------------------------------------------------------------------- */
402/* take care of suid/sgid super-user (root) privileges */ 397/* take care of suid/sgid super-user (root) privileges */
403/* INTPROTO */
404void 398void
405rxvt_privileges(pR_ int mode) 399rxvt_term::privileges (int mode)
406{ 400{
407#if ! defined(__CYGWIN32__) 401#if ! defined(__CYGWIN32__)
408# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 402# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
409/* setreuid() is the poor man's setuid(), seteuid() */ 403/* setreuid() is the poor man's setuid(), seteuid() */
410# define seteuid(a) setreuid(-1, (a)) 404# define seteuid(a) setreuid(-1, (a))
… …
420 */ 414 */
421 seteuid(getuid()); 415 seteuid(getuid());
422 setegid(getgid()); 416 setegid(getgid());
423 break; 417 break;
424 case SAVE: 418 case SAVE:
425 R->euid = geteuid(); 419 euid = geteuid();
426 R->egid = getegid(); 420 egid = getegid();
427 break; 421 break;
428 case RESTORE: 422 case RESTORE:
429 seteuid(R->euid); 423 seteuid(euid);
430 setegid(R->egid); 424 setegid(egid);
431 break; 425 break;
432 } 426 }
433# else 427# else
434 switch (mode) { 428 switch (mode) {
435 case IGNORE: 429 case IGNORE:
… …
444# endif 438# endif
445#endif 439#endif
446} 440}
447 441
448#ifdef UTMP_SUPPORT 442#ifdef UTMP_SUPPORT
449/* EXTPROTO */
450void 443void
451rxvt_privileged_utmp(pR_ char action) 444rxvt_term::privileged_utmp (char action)
452{ 445{
453 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 446 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
454 action, R->next_utmp_action, getpid())); 447 action, next_utmp_action, getpid()));
455 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 448 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
456 || (R->Options & Opt_utmpInhibit) 449 || (Options & Opt_utmpInhibit)
457 || R->ttydev == NULL || *R->ttydev == '\0') 450 || ttydev == NULL || *ttydev == '\0')
458 return; 451 return;
459 452
460 rxvt_privileges(aR_ RESTORE); 453 privileges (RESTORE);
461 if (action == SAVE) { 454 if (action == SAVE) {
462 R->next_utmp_action = RESTORE; 455 next_utmp_action = RESTORE;
463 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 456 makeutent (ttydev, rs[Rs_display_name]);
464 } else { /* action == RESTORE */ 457 } else { /* action == RESTORE */
465 R->next_utmp_action = IGNORE; 458 next_utmp_action = IGNORE;
466 rxvt_cleanutent(aR); 459 cleanutent ();
467 } 460 }
468 rxvt_privileges(aR_ IGNORE); 461 privileges (IGNORE);
469} 462}
470#endif 463#endif
471 464
472#ifndef NO_SETOWNER_TTYDEV 465#ifndef NO_SETOWNER_TTYDEV
473/* EXTPROTO */
474void 466void
475rxvt_privileged_ttydev(pR_ char action) 467rxvt_term::privileged_ttydev (char action)
476{ 468{
477 D_MAIN((stderr, 469 D_MAIN((stderr,
478 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 470 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
479 action, R->next_tty_action, getpid())); 471 action, next_tty_action, getpid()));
480 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 472 if (next_tty_action != action || (action != SAVE && action != RESTORE)
481 || R->ttydev == NULL || *R->ttydev == '\0') 473 || ttydev == NULL || *ttydev == '\0')
482 return; 474 return;
483 475
484 rxvt_privileges(aR_ RESTORE); 476 privileges (RESTORE);
485 477
486 if (action == SAVE) { 478 if (action == SAVE) {
487 R->next_tty_action = RESTORE; 479 next_tty_action = RESTORE;
488# ifndef RESET_TTY_TO_COMMON_DEFAULTS 480# ifndef RESET_TTY_TO_COMMON_DEFAULTS
489/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 481/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
490 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 482 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
491 R->next_tty_action = IGNORE; 483 next_tty_action = IGNORE;
492 else 484 else
493# endif 485# endif
494 { 486 {
495 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 487 chown(ttydev, getuid(), ttygid); /* fail silently */
496 chmod(R->ttydev, R->ttymode); 488 chmod(ttydev, ttymode);
497# ifdef HAVE_REVOKE 489# ifdef HAVE_REVOKE
498 revoke(R->ttydev); 490 revoke(ttydev);
499# endif 491# endif
500 } 492 }
501 } else { /* action == RESTORE */ 493 } else { /* action == RESTORE */
502 R->next_tty_action = IGNORE; 494 next_tty_action = IGNORE;
503# ifndef RESET_TTY_TO_COMMON_DEFAULTS 495# ifndef RESET_TTY_TO_COMMON_DEFAULTS
504 chmod(R->ttydev, R->ttyfd_stat.st_mode); 496 chmod(ttydev, ttyfd_stat.st_mode);
505 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 497 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
506# else 498# else
507 chmod(R->ttydev, 499 chmod(ttydev,
508 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 500 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
509 chown(R->ttydev, 0, 0); 501 chown(ttydev, 0, 0);
510# endif 502# endif
511 } 503 }
512 504
513 rxvt_privileges(aR_ IGNORE); 505 privileges (IGNORE);
514 506
515# ifndef RESET_TTY_TO_COMMON_DEFAULTS 507# ifndef RESET_TTY_TO_COMMON_DEFAULTS
516 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 508 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
517 action == RESTORE ? "Restoring" : (action == 509 action == RESTORE ? "Restoring" : (action ==
518 SAVE ? "Saving" : 510 SAVE ? "Saving" :
519 "UNKNOWN ERROR for"), R->ttydev, 511 "UNKNOWN ERROR for"), ttydev,
520 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 512 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
521 R->ttyfd_stat.st_gid)); 513 ttyfd_stat.st_gid));
522# endif 514# endif
523} 515}
524#endif 516#endif
525 517
526/*----------------------------------------------------------------------*/ 518/*----------------------------------------------------------------------*/
527/* 519/*
528 * window size/position calculcations for XSizeHint and other storage. 520 * window size/position calculcations for XSizeHint and other storage.
529 * if width/height are non-zero then override calculated width/height 521 * if width/height are non-zero then override calculated width/height
530 */ 522 */
531/* EXTPROTO */
532void 523void
533rxvt_window_calc(pR_ unsigned int width, unsigned int height) 524rxvt_term::window_calc (unsigned int width, unsigned int height)
534{ 525{
535 short recalc_x, recalc_y; 526 short recalc_x, recalc_y;
536 int x, y, sb_w, mb_h, flags; 527 int x, y, sb_w, mb_h, flags;
537 unsigned int w, h; 528 unsigned int w, h;
538 unsigned int max_width, max_height; 529 unsigned int max_width, max_height;
539 530
540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 531 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
541 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 532 TermWin.ncol, TermWin.nrow, szHint.width,
542 R->szHint.height)); 533 szHint.height));
543 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
544 R->szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
545/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 536/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
546 537
547 recalc_x = recalc_y = 0; 538 recalc_x = recalc_y = 0;
548 flags = 0; 539 flags = 0;
549 if (!R->parsed_geometry) { 540 if (!parsed_geometry) {
550 R->parsed_geometry = 1; 541 parsed_geometry = 1;
551 if (R->rs[Rs_geometry]) 542 if (rs[Rs_geometry])
552 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 543 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
553 if (flags & WidthValue) { 544 if (flags & WidthValue) {
554 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 545 TermWin.ncol = BOUND_POSITIVE_INT16(w);
555 R->szHint.flags |= USSize; 546 szHint.flags |= USSize;
556 } 547 }
557 if (flags & HeightValue) { 548 if (flags & HeightValue) {
558 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 549 TermWin.nrow = BOUND_POSITIVE_INT16(h);
559 R->szHint.flags |= USSize; 550 szHint.flags |= USSize;
560 } 551 }
561 if (flags & XValue) { 552 if (flags & XValue) {
562 R->szHint.x = x; 553 szHint.x = x;
563 R->szHint.flags |= USPosition; 554 szHint.flags |= USPosition;
564 if (flags & XNegative) { 555 if (flags & XNegative) {
565 recalc_x = 1; 556 recalc_x = 1;
566 R->szHint.win_gravity = NorthEastGravity; 557 szHint.win_gravity = NorthEastGravity;
567 } 558 }
568 } 559 }
569 if (flags & YValue) { 560 if (flags & YValue) {
570 R->szHint.y = y; 561 szHint.y = y;
571 R->szHint.flags |= USPosition; 562 szHint.flags |= USPosition;
572 if (flags & YNegative) { 563 if (flags & YNegative) {
573 recalc_y = 1; 564 recalc_y = 1;
574 if (R->szHint.win_gravity == NorthEastGravity) 565 if (szHint.win_gravity == NorthEastGravity)
575 R->szHint.win_gravity = SouthEastGravity; 566 szHint.win_gravity = SouthEastGravity;
576 else 567 else
577 R->szHint.win_gravity = SouthWestGravity; 568 szHint.win_gravity = SouthWestGravity;
578 } 569 }
579 } 570 }
580 } 571 }
581/* TODO: BOUNDS */ 572/* TODO: BOUNDS */
582 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 573 TermWin.width = TermWin.ncol * TermWin.fwidth;
583 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 574 TermWin.height = TermWin.nrow * TermWin.fheight;
584 max_width = MAX_COLS * R->TermWin.fwidth; 575 max_width = MAX_COLS * TermWin.fwidth;
585 max_height = MAX_ROWS * R->TermWin.fheight; 576 max_height = MAX_ROWS * TermWin.fheight;
586 577
587 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 578 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
588 579
589 sb_w = mb_h = 0; 580 sb_w = mb_h = 0;
590 R->window_vt_x = R->window_vt_y = 0; 581 window_vt_x = window_vt_y = 0;
591 if (scrollbar_visible(R)) { 582 if (scrollbar_visible ()) {
592 sb_w = scrollbar_TotalWidth(); 583 sb_w = scrollbar_TotalWidth();
593 R->szHint.base_width += sb_w; 584 szHint.base_width += sb_w;
594 if (!(R->Options & Opt_scrollBar_right)) 585 if (!(Options & Opt_scrollBar_right))
595 R->window_vt_x = sb_w; 586 window_vt_x = sb_w;
596 } 587 }
597 if (menubar_visible(R)) { 588 if (menubar_visible ()) {
598 mb_h = menuBar_TotalHeight(); 589 mb_h = menuBar_TotalHeight();
599 R->szHint.base_height += mb_h; 590 szHint.base_height += mb_h;
600 R->window_vt_y = mb_h; 591 window_vt_y = mb_h;
601 } 592 }
602 R->szHint.width_inc = R->TermWin.fwidth; 593 szHint.width_inc = TermWin.fwidth;
603 R->szHint.height_inc = R->TermWin.fheight; 594 szHint.height_inc = TermWin.fheight;
604 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 595 szHint.min_width = szHint.base_width + szHint.width_inc;
605 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 596 szHint.min_height = szHint.base_height + szHint.height_inc;
606 597
607 if (width && width - R->szHint.base_width < max_width) { 598 if (width && width - szHint.base_width < max_width) {
608 R->szHint.width = width; 599 szHint.width = width;
609 R->TermWin.width = width - R->szHint.base_width; 600 TermWin.width = width - szHint.base_width;
610 } else { 601 } else {
611 MIN_IT(R->TermWin.width, max_width); 602 MIN_IT(TermWin.width, max_width);
612 R->szHint.width = R->szHint.base_width + R->TermWin.width; 603 szHint.width = szHint.base_width + TermWin.width;
613 } 604 }
614 if (height && height - R->szHint.base_height < max_height) { 605 if (height && height - szHint.base_height < max_height) {
615 R->szHint.height = height; 606 szHint.height = height;
616 R->TermWin.height = height - R->szHint.base_height; 607 TermWin.height = height - szHint.base_height;
617 } else { 608 } else {
618 MIN_IT(R->TermWin.height, max_height); 609 MIN_IT(TermWin.height, max_height);
619 R->szHint.height = R->szHint.base_height + R->TermWin.height; 610 szHint.height = szHint.base_height + TermWin.height;
620 } 611 }
621 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 612 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
622 R->window_sb_x = R->szHint.width - sb_w; 613 window_sb_x = szHint.width - sb_w;
623 614
624 if (recalc_x) 615 if (recalc_x)
625 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 616 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
626 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 617 - szHint.width - 2 * TermWin.ext_bwidth);
627 if (recalc_y) 618 if (recalc_y)
628 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 619 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
629 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 620 - szHint.height - 2 * TermWin.ext_bwidth);
630 621
631 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 622 TermWin.ncol = TermWin.width / TermWin.fwidth;
632 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 623 TermWin.nrow = TermWin.height / TermWin.fheight;
633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 624 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
634 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 625 TermWin.ncol, TermWin.nrow, szHint.width,
635 R->szHint.height)); 626 szHint.height));
636 return; 627 return;
637} 628}
638 629
639/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
640/* 631/*
… …
642 * Called after a window size change. 633 * Called after a window size change.
643 */ 634 */
644void 635void
645rxvt_term::tt_winch () 636rxvt_term::tt_winch ()
646{ 637{
647 struct winsize ws; 638 struct winsize ws;
648 639
649 if (cmd_fd < 0) 640 if (cmd_fd < 0)
650 return; 641 return;
651 642
652 ws.ws_col = TermWin.ncol; 643 ws.ws_col = TermWin.ncol;
… …
670 * init = 1 - initialize 661 * init = 1 - initialize
671 * 662 *
672 * fontname == FONT_UP - switch to bigger font 663 * fontname == FONT_UP - switch to bigger font
673 * fontname == FONT_DN - switch to smaller font 664 * fontname == FONT_DN - switch to smaller font
674 */ 665 */
675/* EXTPROTO */
676void 666void
677rxvt_change_font(pR_ int init, const char *fontname) 667rxvt_term::change_font (int init, const char *fontname)
678{ 668{
679} 669}
680 670
681/* INTPROTO */
682void 671void
683rxvt_font_up_down(pR_ int n, int direction) 672rxvt_term::font_up_down (int n, int direction)
684{ 673{
685} 674}
686 675
687/*----------------------------------------------------------------------*/ 676/*----------------------------------------------------------------------*/
688/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
689/* xterm sequences - title, iconName, color (exptl) */ 678/* xterm sequences - title, iconName, color (exptl) */
690/* EXTPROTO */
691void 679void
692rxvt_set_title(pR_ const char *str) 680rxvt_term::set_title (const char *str)
693{ 681{
694#ifndef SMART_WINDOW_TITLE 682#ifndef SMART_WINDOW_TITLE
695 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 683 XStoreName(Xdisplay, TermWin.parent[0], str);
696#else 684#else
697 char *name; 685 char *name;
698 686
699 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 687 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
700 name = NULL; 688 name = NULL;
701 if (name == NULL || STRCMP(name, str)) 689 if (name == NULL || STRCMP(name, str))
702 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 690 XStoreName(Xdisplay, TermWin.parent[0], str);
703 if (name) 691 if (name)
704 XFree(name); 692 XFree(name);
705#endif 693#endif
706} 694}
707 695
708/* EXTPROTO */
709void 696void
710rxvt_set_iconName(pR_ const char *str) 697rxvt_term::set_iconName (const char *str)
711{ 698{
712#ifndef SMART_WINDOW_TITLE 699#ifndef SMART_WINDOW_TITLE
713 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 700 XSetIconName(Xdisplay, TermWin.parent[0], str);
714#else 701#else
715 char *name; 702 char *name;
716 703
717 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 704 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
718 name = NULL; 705 name = NULL;
719 if (name == NULL || STRCMP(name, str)) 706 if (name == NULL || STRCMP(name, str))
720 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 707 XSetIconName(Xdisplay, TermWin.parent[0], str);
721 if (name) 708 if (name)
722 XFree(name); 709 XFree(name);
723#endif 710#endif
724} 711}
725 712
726#ifdef XTERM_COLOR_CHANGE 713#ifdef XTERM_COLOR_CHANGE
727/* EXTPROTO */
728void 714void
729rxvt_set_window_color(pR_ int idx, const char *color) 715rxvt_term::set_window_color (int idx, const char *color)
730{ 716{
731 rxvt_color xcol; 717 rxvt_color xcol;
732 int i; 718 int i;
733 719
734 if (color == NULL || *color == '\0') 720 if (color == NULL || *color == '\0')
… …
738 if (isdigit(*color)) { 724 if (isdigit(*color)) {
739 i = atoi(color); 725 i = atoi(color);
740 if (i >= 8 && i <= 15) { /* bright colors */ 726 if (i >= 8 && i <= 15) { /* bright colors */
741 i -= 8; 727 i -= 8;
742# ifndef NO_BRIGHTCOLOR 728# ifndef NO_BRIGHTCOLOR
743 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 729 PixColors[idx] = PixColors[minBrightCOLOR + i];
744 SET_PIXCOLOR(R, idx); 730 SET_PIXCOLOR(idx);
745 goto Done; 731 goto Done;
746# endif 732# endif
747 } 733 }
748 if (i >= 0 && i <= 7) { /* normal colors */ 734 if (i >= 0 && i <= 7) { /* normal colors */
749 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 735 PixColors[idx] = PixColors[minCOLOR + i];
750 SET_PIXCOLOR(R, idx); 736 SET_PIXCOLOR(idx);
751 goto Done; 737 goto Done;
752 } 738 }
753 } 739 }
754 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 740 if (!rXParseAllocColor (& xcol, color))
755 return; 741 return;
756/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 742/* XStoreColor (Xdisplay, XCMAP, XColor*); */
757 743
758/* 744/*
759 * FIXME: should free colors here, but no idea how to do it so instead, 745 * FIXME: should free colors here, but no idea how to do it so instead,
760 * so just keep gobbling up the colormap 746 * so just keep gobbling up the colormap
761 */ 747 */
762# if 0 748# if 0
763 for (i = Color_Black; i <= Color_White; i++) 749 for (i = Color_Black; i <= Color_White; i++)
764 if (R->PixColors[idx] == R->PixColors[i]) 750 if (PixColors[idx] == PixColors[i])
765 break; 751 break;
766 if (i > Color_White) { 752 if (i > Color_White) {
767 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 753 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
768 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 754 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
769 DisplayPlanes(R->Xdisplay, Xscreen)); 755 DisplayPlanes(Xdisplay, Xscreen));
770 } 756 }
771# endif 757# endif
772 758
773 R->PixColors[idx] = xcol; 759 PixColors[idx] = xcol;
774 SET_PIXCOLOR(R, idx); 760 SET_PIXCOLOR(idx);
775 761
776/* XSetWindowAttributes attr; */ 762/* XSetWindowAttributes attr; */
777/* Cursor cursor; */ 763/* Cursor cursor; */
778 Done: 764 Done:
779 if (idx == Color_bg && !(R->Options & Opt_transparent)) 765 if (idx == Color_bg && !(Options & Opt_transparent))
780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 766 XSetWindowBackground(Xdisplay, TermWin.vt,
781 R->PixColors[Color_bg]); 767 PixColors[Color_bg]);
782 768
783/* handle Color_BD, scrollbar background, etc. */ 769/* handle Color_BD, scrollbar background, etc. */
784 770
785 rxvt_set_colorfgbg (aR); 771 set_colorfgbg ();
786 R->recolour_cursor (); 772 recolour_cursor ();
787/* the only reasonable way to enforce a clean update */ 773/* the only reasonable way to enforce a clean update */
788 rxvt_scr_poweron (aR); 774 scr_poweron ();
789} 775}
790 776
791#else 777#else
792# define rxvt_set_window_color(aR_ idx,color) ((void)0) 778# define set_window_color (idx,color) ((void)0)
793#endif /* XTERM_COLOR_CHANGE */ 779#endif /* XTERM_COLOR_CHANGE */
794 780
795void 781void
796rxvt_term::recolour_cursor () 782rxvt_term::recolour_cursor ()
797{ 783{
… …
807 793
808/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
809/* 795/*
810 * find if fg/bg matches any of the normal (low-intensity) colors 796 * find if fg/bg matches any of the normal (low-intensity) colors
811 */ 797 */
812/* INTPROTO */
813void 798void
814rxvt_set_colorfgbg(pR) 799rxvt_term::set_colorfgbg ()
815{ 800{
816 unsigned int i; 801 unsigned int i;
817 const char *xpmb = "\0"; 802 const char *xpmb = "\0";
818 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 803 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
819 804
820 R->env_colorfgbg = 805 env_colorfgbg =
821 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 806 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
822 STRCPY(fstr, "default"); 807 STRCPY(fstr, "default");
823 STRCPY(bstr, "default"); 808 STRCPY(bstr, "default");
824 for (i = Color_Black; i <= Color_White; i++) 809 for (i = Color_Black; i <= Color_White; i++)
825 if (R->PixColors[Color_fg] == R->PixColors[i]) { 810 if (PixColors[Color_fg] == PixColors[i]) {
826 sprintf(fstr, "%d", (i - Color_Black)); 811 sprintf(fstr, "%d", (i - Color_Black));
827 break; 812 break;
828 } 813 }
829 for (i = Color_Black; i <= Color_White; i++) 814 for (i = Color_Black; i <= Color_White; i++)
830 if (R->PixColors[Color_bg] == R->PixColors[i]) { 815 if (PixColors[Color_bg] == PixColors[i]) {
831 sprintf(bstr, "%d", (i - Color_Black)); 816 sprintf(bstr, "%d", (i - Color_Black));
832#ifdef XPM_BACKGROUND 817#ifdef XPM_BACKGROUND
833 xpmb = "default;"; 818 xpmb = "default;";
834#endif 819#endif
835 break; 820 break;
836 } 821 }
837 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 822 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
838 putenv(R->env_colorfgbg); 823 putenv(env_colorfgbg);
839 824
840#ifndef NO_BRIGHTCOLOR 825#ifndef NO_BRIGHTCOLOR
841 R->colorfgbg = DEFAULT_RSTYLE; 826 colorfgbg = DEFAULT_RSTYLE;
842 for (i = minCOLOR; i <= maxCOLOR; i++) { 827 for (i = minCOLOR; i <= maxCOLOR; i++) {
843 if (R->PixColors[Color_fg] == R->PixColors[i]) 828 if (PixColors[Color_fg] == PixColors[i])
844 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 829 colorfgbg = SET_FGCOLOR(colorfgbg, i);
845 if (R->PixColors[Color_bg] == R->PixColors[i]) 830 if (PixColors[Color_bg] == PixColors[i])
846 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 831 colorfgbg = SET_BGCOLOR(colorfgbg, i);
847 } 832 }
848#endif 833#endif
849} 834}
850 835
851/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
852/* 837/*
853 * Colour determination for low colour displays, routine from 838 * Colour determination for low colour displays, routine from
854 * Hans de Goede <hans@highrise.nl> 839 * Hans de Goede <hans@highrise.nl>
855 */ 840 */
856 841
857/* EXTPROTO */
858int 842int
859rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 843rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
860{ 844{
861 screen_in_out->set(aR_ colour);
862
863 if (!screen_in_out->set(aR_ colour)) { 845 if (!screen_in_out->set (this, colour)) {
864 rxvt_print_error("can't allocate colour: %s", colour); 846 rxvt_print_error("can't allocate colour: %s", colour);
865 return false; 847 return false;
866 } 848 }
867 849
868 return true; 850 return true;
869} 851}
870 852
871/* -------------------------------------------------------------------- * 853/* -------------------------------------------------------------------- *
872 * - WINDOW RESIZING - * 854 * - WINDOW RESIZING - *
873 * -------------------------------------------------------------------- */ 855 * -------------------------------------------------------------------- */
874/* EXTPROTO */
875void 856void
876rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 857rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
877 int ignoreparent)
878{ 858{
879 int fix_screen; 859 int fix_screen;
880 860
881#ifdef SMART_RESIZE 861#ifdef SMART_RESIZE
882 int old_width = R->szHint.width, old_height = R->szHint.height; 862 int old_width = szHint.width, old_height = szHint.height;
883#endif 863#endif
884 864
885 rxvt_window_calc(aR_ width, height); 865 window_calc (width, height);
886 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 866 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
887 if (!ignoreparent) { 867 if (!ignoreparent)
868 {
888#ifdef SMART_RESIZE 869#ifdef SMART_RESIZE
889/* 870 /*
890 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 871 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
891 * reposition window on resize depending on placement on screen 872 * reposition window on resize depending on placement on screen
892 */ 873 */
893 int x, y, x1, y1; 874 int x, y, x1, y1;
894 int dx, dy; 875 int dx, dy;
895 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 876 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
896 Window unused_cr; 877 Window unused_cr;
897 878
898 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 879 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
899 0, 0, &x, &y, &unused_cr); 880 0, 0, &x, &y, &unused_cr);
900 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 881 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
901 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 882 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
902 /* 883 /*
903 * if Xroot isn't the parent window, a WM will probably have offset 884 * if Xroot isn't the parent window, a WM will probably have offset
904 * our position for handles and decorations. Counter it 885 * our position for handles and decorations. Counter it
905 */ 886 */
906 if (x1 != x || y1 != y) { 887 if (x1 != x || y1 != y) {
907 x -= x1; 888 x -= x1;
908 y -= y1; 889 y -= y1;
890 }
891
892 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
893 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
894 dx = old_width - szHint.width;
895 dy = old_height - szHint.height;
896
897 /* Check position of the center of the window */
898 if (x < x1) /* left half */
899 dx = 0;
900 else if (x == x1) /* exact center */
901 dx /= 2;
902 if (y < y1) /* top half */
903 dy = 0;
904 else if (y == y1) /* exact center */
905 dy /= 2;
906
907 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
908 szHint.width, szHint.height);
909#else
910 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
911 szHint.height);
912#endif
913 }
914
915 fix_screen = (TermWin.ncol != prev_ncol
916 || TermWin.nrow != prev_nrow);
917
918 if (fix_screen || width != old_width || height != old_height)
919 {
920 if (scrollbar_visible ())
921 {
922 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
923 0, scrollbar_TotalWidth (), szHint.height);
924 resize_scrollbar ();
909 } 925 }
910 926
911 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 927 if (menubar_visible ())
912 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 928 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
913 dx = old_width - R->szHint.width; 929 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
914 dy = old_height - R->szHint.height;
915 930
916 /* Check position of the center of the window */ 931 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
917 if (x < x1) /* left half */ 932 window_vt_y, TermWin_TotalWidth (),
918 dx = 0; 933 TermWin_TotalHeight ());
919 else if (x == x1) /* exact center */ 934#ifdef RXVT_GRAPHICS
920 dx /= 2; 935 if (old_height)
921 if (y < y1) /* top half */ 936 Gr_Resize (old_width - szHint.base_width,
922 dy = 0;
923 else if (y == y1) /* exact center */
924 dy /= 2;
925
926 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
927 R->szHint.width, R->szHint.height);
928#else
929 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
930 R->szHint.height); 937 old_height - szHint.base_height);
931#endif 938#endif
939 scr_clear ();
940#ifdef XPM_BACKGROUND
941 resize_pixmap ();
942#endif
943 }
944
945 if (fix_screen || old_height == 0)
932 } 946 {
947 int curr_screen = -1;
948 int old_ncol = prev_ncol;
933 949
934 fix_screen = (R->TermWin.ncol != R->prev_ncol 950 /* scr_reset only works on the primary screen */
935 || R->TermWin.nrow != R->prev_nrow); 951 if (old_height) /* this is not the first time through */
936 if (fix_screen || width != R->old_width || height != R->old_height) { 952 {
937 if (scrollbar_visible(R)) { 953 unsigned int ncol = TermWin.ncol;
938 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 954 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
939 0, scrollbar_TotalWidth(), R->szHint.height); 955 curr_screen = scr_change_screen (PRIMARY);
940 rxvt_Resize_scrollBar(aR); 956 TermWin.ncol = ncol;
941 } 957 }
942 if (menubar_visible(R))
943 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
944 0, TermWin_TotalWidth(), menuBar_TotalHeight());
945 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
946 R->window_vt_y, TermWin_TotalWidth(),
947 TermWin_TotalHeight());
948#ifdef RXVT_GRAPHICS
949 if (R->old_height)
950 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
951 R->old_height - R->szHint.base_height);
952#endif
953 rxvt_scr_clear(aR);
954#ifdef XPM_BACKGROUND
955 rxvt_resize_pixmap(aR);
956#endif
957 }
958 958
959 if (fix_screen || R->old_height == 0) {
960 int curr_screen = -1;
961 uint16_t old_ncol = R->prev_ncol;
962
963 /* scr_reset only works on the primary screen */
964 if (R->old_height) /* this is not the first time through */
965 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
966
967 R->scr_reset(); 959 scr_reset();
968 960
969 if (curr_screen >= 0) { /* this is not the first time through */ 961 if (curr_screen >= 0) /* this is not the first time through */
962 {
970 rxvt_scr_change_screen(aR_ curr_screen); 963 scr_change_screen (curr_screen);
971 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 964 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
972 } 965 }
973 } 966 }
974 967
975 R->old_width = R->szHint.width; 968 old_width = szHint.width;
976 R->old_height = R->szHint.height; 969 old_height = szHint.height;
977 970
978#ifdef USE_XIM 971#ifdef USE_XIM
979 rxvt_IMSetStatusPosition(aR); 972 IMSetStatusPosition ();
980#endif 973#endif
981} 974}
982 975
983/* 976/*
984 * Set the width/height of the vt window in characters. Units are pixels. 977 * Set the width/height of the vt window in characters. Units are pixels.
985 * good for toggling 80/132 columns 978 * good for toggling 80/132 columns
986 */ 979 */
987/* EXTPROTO */
988void 980void
989rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 981rxvt_term::set_widthheight (unsigned int width, unsigned int height)
990{ 982{
991 XWindowAttributes wattr; 983 XWindowAttributes wattr;
992 984
993 if (width == 0 || height == 0) { 985 if (width == 0 || height == 0) {
994 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 986 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
995 if (width == 0) 987 if (width == 0)
996 width = wattr.width - R->szHint.base_width; 988 width = wattr.width - szHint.base_width;
997 if (height == 0) 989 if (height == 0)
998 height = wattr.height - R->szHint.base_height; 990 height = wattr.height - szHint.base_height;
999 } 991 }
1000 if (width != R->TermWin.width || height != R->TermWin.height) { 992 if (width != TermWin.width || height != TermWin.height) {
1001 width += R->szHint.base_width; 993 width += szHint.base_width;
1002 height += R->szHint.base_height; 994 height += szHint.base_height;
1003 rxvt_resize_all_windows(aR_ width, height, 0); 995 resize_all_windows (width, height, 0);
1004 } 996 }
1005} 997}
1006 998
1007/* -------------------------------------------------------------------- * 999/* -------------------------------------------------------------------- *
1008 * - X INPUT METHOD ROUTINES - * 1000 * - X INPUT METHOD ROUTINES - *
1009 * -------------------------------------------------------------------- */ 1001 * -------------------------------------------------------------------- */
1010#ifdef USE_XIM 1002#ifdef USE_XIM
1011/* INTPROTO */
1012void 1003void
1013rxvt_setSize(pR_ XRectangle * size) 1004rxvt_term::set_size (XRectangle *size)
1014{ 1005{
1015 size->x = R->TermWin.int_bwidth; 1006 size->x = TermWin.int_bwidth;
1016 size->y = R->TermWin.int_bwidth; 1007 size->y = TermWin.int_bwidth;
1017 size->width = Width2Pixel(R->TermWin.ncol); 1008 size->width = Width2Pixel(TermWin.ncol);
1018 size->height = Height2Pixel(R->TermWin.nrow); 1009 size->height = Height2Pixel(TermWin.nrow);
1019} 1010}
1020 1011
1021/* INTPROTO */
1022void 1012void
1023rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1013rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
1024{ 1014{
1025 *fg = R->PixColors[Color_fg]; 1015 *fg = PixColors[Color_fg];
1026 *bg = R->PixColors[Color_bg]; 1016 *bg = PixColors[Color_bg];
1027} 1017}
1028 1018
1029/* Checking whether input method is running. */ 1019/* Checking whether input method is running. */
1030/* INTPROTO */
1031Bool 1020bool
1032rxvt_IMisRunning(pR) 1021rxvt_term::IMisRunning ()
1033{ 1022{
1034 char *p; 1023 char *p;
1035 Atom atom; 1024 Atom atom;
1036 Window win; 1025 Window win;
1037 char server[IMBUFSIZ]; 1026 char server[IMBUFSIZ];
… …
1041 STRCPY(server, "@server="); 1030 STRCPY(server, "@server=");
1042 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1031 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1043 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1032 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1044 *p = '\0'; 1033 *p = '\0';
1045 1034
1046 atom = XInternAtom(R->Xdisplay, server, False); 1035 atom = XInternAtom(Xdisplay, server, False);
1047 win = XGetSelectionOwner(R->Xdisplay, atom); 1036 win = XGetSelectionOwner(Xdisplay, atom);
1048 if (win != None) 1037 if (win != None)
1049 return True; 1038 return True;
1050 } 1039 }
1051 return False; 1040 return False;
1052} 1041}
1053 1042
1054/* EXTPROTO */
1055void 1043void
1056rxvt_IMSendSpot(pR) 1044rxvt_term::IMSendSpot ()
1057{ 1045{
1058 XPoint spot; 1046 XPoint spot;
1059 XVaNestedList preedit_attr; 1047 XVaNestedList preedit_attr;
1060 1048
1061 if (R->Input_Context == NULL 1049 if (Input_Context == NULL
1062 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1050 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1063 || !(R->event_type == KeyPress 1051 || !(event_type == KeyPress
1064 || R->event_type == Expose 1052 || event_type == Expose
1065 || R->event_type == NoExpose 1053 || event_type == NoExpose
1066 || R->event_type == SelectionNotify 1054 || event_type == SelectionNotify
1067 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1055 || event_type == ButtonRelease || event_type == FocusIn)
1068 || !rxvt_IMisRunning(aR)) 1056 || !IMisRunning ())
1069 return; 1057 return;
1070 1058
1071 rxvt_setPosition(aR_ & spot); 1059 set_position (&spot);
1072 1060
1073 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1061 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1074 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1062 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1075 XFree(preedit_attr); 1063 XFree(preedit_attr);
1076} 1064}
1077 1065
1066void
1067rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect)
1069{
1070 int mbh, vtx = 0;
1071
1072 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth();
1074
1075 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1076 mbh -= TermWin.lineSpace;
1077
1078 preedit_rect->x = needed_rect->width + vtx;
1079 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1080
1081 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1082 preedit_rect->height = Height2Pixel(1);
1083
1084 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1086
1087 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1088 status_rect->height = Height2Pixel(1);
1089}
1090
1091/* ARGSUSED */
1078/* EXTPROTO */ 1092/* EXTPROTO */
1079void
1080rxvt_setTermFontSet(pR_ int idx)
1081{
1082 char *string;
1083 long length;
1084 int success = 0;
1085
1086 if (idx < 0 || idx >= MAX_NFONTS)
1087 return;
1088}
1089
1090/* INTPROTO */
1091void
1092rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1093 XRectangle * needed_rect)
1094{
1095 int mbh, vtx = 0;
1096
1097 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1098 vtx = scrollbar_TotalWidth();
1099 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
1100 mbh -= R->TermWin.lineSpace;
1101
1102 preedit_rect->x = needed_rect->width + vtx;
1103 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1104
1105 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1106 + vtx;
1107 preedit_rect->height = Height2Pixel(1);
1108
1109 status_rect->x = vtx;
1110 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1111
1112 status_rect->width = needed_rect->width ? needed_rect->width
1113 : Width2Pixel(R->TermWin.ncol + 1);
1114 status_rect->height = Height2Pixel(1);
1115}
1116
1117/* ARGSUSED */
1118/* INTPROTO */
1119void 1093void
1120rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1094rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1121 __attribute__ ((unused)), XPointer call_data 1095 __attribute__ ((unused)), XPointer call_data
1122 __attribute__ ((unused))) 1096 __attribute__ ((unused)))
1123{ 1097{
1124 dR;
1125
1126 R->Input_Context = NULL; 1098 GET_R->Input_Context = NULL;
1127/* To avoid Segmentation Fault in C locale: Solaris only? */ 1099/* To avoid Segmentation Fault in C locale: Solaris only? */
1128 if (STRCMP(R->locale, "C")) 1100 if (STRCMP (GET_R->locale, "C"))
1129 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1101 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1130 rxvt_IMInstantiateCallback, NULL); 1102 rxvt_IMInstantiateCallback, NULL);
1131}
1132
1133/*
1134 * X manual pages and include files don't match on some systems:
1135 * some think this is an XIDProc and others an XIMProc so we can't
1136 * use the first argument - need to update this to be nice for
1137 * both types via some sort of configure detection
1138 */
1139/* ARGSUSED */
1140/* EXTPROTO */
1141void
1142rxvt_IMInstantiateCallback(Display * unused
1143 __attribute__ ((unused)), XPointer client_data
1144 __attribute__ ((unused)), XPointer call_data
1145 __attribute__ ((unused)))
1146{
1147 dR;
1148 int i, found, had_im;
1149 const char *p;
1150 char **s;
1151 char buf[IMBUFSIZ];
1152
1153 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1154 if (R->Input_Context)
1155 return;
1156
1157#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1158 if (R->rs[Rs_imLocale])
1159 setlocale (LC_CTYPE, R->rs[Rs_imLocale]);
1160#endif
1161
1162 p = R->rs[Rs_inputMethod];
1163 if (p && *p)
1164 {
1165 bool found = false;
1166
1167 s = rxvt_splitcommastring (p);
1168 for (i = 0; s[i]; i++)
1169 {
1170 if (*s[i])
1171 {
1172 STRCPY (buf, "@im=");
1173 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1174 if ((p = XSetLocaleModifiers (buf)) && *p
1175 && rxvt_IM_get_IC (aR))
1176 {
1177 found = true;
1178 break;
1179 }
1180 }
1181 }
1182 for (i = 0; s[i]; i++)
1183 free(s[i]);
1184 free(s);
1185
1186 if (found)
1187 goto done;
1188 }
1189
1190/* try with XMODIFIERS env. var. */
1191 if ((p = XSetLocaleModifiers ("")) && *p
1192 && rxvt_IM_get_IC (aR))
1193 goto done;
1194
1195/* try with no modifiers base IF the user didn't specify an IM */
1196 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1197 && rxvt_IM_get_IC (aR) == True)
1198 goto done;
1199
1200done:
1201#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1202 if (R->rs[Rs_imLocale])
1203 setlocale (LC_CTYPE, R->locale);
1204#endif
1205} 1103}
1206 1104
1207/* 1105/*
1208 * Try to open a XIM with the current modifiers, then see if we can 1106 * Try to open a XIM with the current modifiers, then see if we can
1209 * open a suitable preedit type 1107 * open a suitable preedit type
1210 */ 1108 */
1211/* INTPROTO */
1212Bool 1109bool
1213rxvt_IM_get_IC(pR) 1110rxvt_term::IM_get_IC ()
1214{ 1111{
1215 int i, j, found; 1112 int i, j, found;
1216 XIM xim; 1113 XIM xim;
1217 XPoint spot; 1114 XPoint spot;
1218 XRectangle rect, status_rect, needed_rect; 1115 XRectangle rect, status_rect, needed_rect;
… …
1222 XIMStyles *xim_styles; 1119 XIMStyles *xim_styles;
1223 XVaNestedList preedit_attr, status_attr; 1120 XVaNestedList preedit_attr, status_attr;
1224 XIMCallback ximcallback; 1121 XIMCallback ximcallback;
1225 1122
1226 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1123 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1227 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1124 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1228 if (xim == NULL) 1125 if (xim == NULL)
1229 return False; 1126 return False;
1230 1127
1231 xim_styles = NULL; 1128 xim_styles = NULL;
1232 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1129 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1233 || !xim_styles || !xim_styles->count_styles) { 1130 || !xim_styles || !xim_styles->count_styles) {
1234 XCloseIM(xim); 1131 XCloseIM(xim);
1235 return False; 1132 return False;
1236 } 1133 }
1237 1134
1238 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1135 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1239 : "OverTheSpot,OffTheSpot,Root"; 1136 : "OverTheSpot,OffTheSpot,Root";
1240 s = rxvt_splitcommastring(p); 1137 s = rxvt_splitcommastring(p);
1241 for (i = found = 0; !found && s[i]; i++) { 1138 for (i = found = 0; !found && s[i]; i++) {
1242 if (!STRCMP(s[i], "OverTheSpot")) 1139 if (!STRCMP(s[i], "OverTheSpot"))
1243 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1140 input_style = (XIMPreeditPosition | XIMStatusNothing);
1244 else if (!STRCMP(s[i], "OffTheSpot")) 1141 else if (!STRCMP(s[i], "OffTheSpot"))
1245 R->input_style = (XIMPreeditArea | XIMStatusArea); 1142 input_style = (XIMPreeditArea | XIMStatusArea);
1246 else if (!STRCMP(s[i], "Root")) 1143 else if (!STRCMP(s[i], "Root"))
1247 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1144 input_style = (XIMPreeditNothing | XIMStatusNothing);
1248 1145
1249 for (j = 0; j < xim_styles->count_styles; j++) 1146 for (j = 0; j < xim_styles->count_styles; j++)
1250 if (R->input_style == xim_styles->supported_styles[j]) { 1147 if (input_style == xim_styles->supported_styles[j]) {
1251 found = 1; 1148 found = 1;
1252 break; 1149 break;
1253 } 1150 }
1254 } 1151 }
1255 for (i = 0; s[i]; i++) 1152 for (i = 0; s[i]; i++)
… …
1262 return False; 1159 return False;
1263 } 1160 }
1264 1161
1265 ximcallback.callback = rxvt_IMDestroyCallback; 1162 ximcallback.callback = rxvt_IMDestroyCallback;
1266 1163
1267/* XXX: not sure why we need this (as well as IC one below) */ 1164 /* XXX: not sure why we need this (as well as IC one below) */
1268 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1165 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1269 1166
1270 preedit_attr = status_attr = NULL; 1167 preedit_attr = status_attr = NULL;
1271 1168
1272 if (R->input_style & XIMPreeditPosition) { 1169 if (input_style & XIMPreeditPosition) {
1273 rxvt_setSize(aR_ & rect); 1170 set_size (&rect);
1274 rxvt_setPosition(aR_ & spot); 1171 set_position (&spot);
1275 rxvt_setColor(aR_ & fg, &bg); 1172 set_color (&fg, &bg);
1276 1173
1277 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1174 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1278 XNSpotLocation, &spot, 1175 XNSpotLocation, &spot,
1279 XNForeground, fg, XNBackground, bg, 1176 XNForeground, fg, XNBackground, bg,
1280 //XNFontSet, R->TermWin.fontset, 1177 //XNFontSet, TermWin.fontset,
1281 NULL); 1178 NULL);
1282 } else if (R->input_style & XIMPreeditArea) { 1179 } else if (input_style & XIMPreeditArea) {
1283 rxvt_setColor(aR_ & fg, &bg); 1180 set_color (&fg, &bg);
1284 1181
1285 /* 1182 /*
1286 * The necessary width of preedit area is unknown 1183 * The necessary width of preedit area is unknown
1287 * until create input context. 1184 * until create input context.
1288 */ 1185 */
1289 needed_rect.width = 0; 1186 needed_rect.width = 0;
1290 1187
1291 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); 1188 set_preedit_area(&rect, &status_rect, &needed_rect);
1292 1189
1293 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1190 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1294 XNForeground, fg, XNBackground, bg, 1191 XNForeground, fg, XNBackground, bg,
1295 //XNFontSet, R->TermWin.fontset, 1192 //XNFontSet, TermWin.fontset,
1296 NULL); 1193 NULL);
1297 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1194 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1298 XNForeground, fg, XNBackground, bg, 1195 XNForeground, fg, XNBackground, bg,
1299 //XNFontSet, R->TermWin.fontset, 1196 //XNFontSet, TermWin.fontset,
1300 NULL); 1197 NULL);
1301 } 1198 }
1302 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1199 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1303 XNClientWindow, R->TermWin.parent[0], 1200 XNClientWindow, TermWin.parent[0],
1304 XNFocusWindow, R->TermWin.parent[0], 1201 XNFocusWindow, TermWin.parent[0],
1305 XNDestroyCallback, &ximcallback, 1202 XNDestroyCallback, &ximcallback,
1306 preedit_attr ? XNPreeditAttributes : NULL, 1203 preedit_attr ? XNPreeditAttributes : NULL,
1307 preedit_attr, 1204 preedit_attr,
1308 status_attr ? XNStatusAttributes : NULL, 1205 status_attr ? XNStatusAttributes : NULL,
1309 status_attr, NULL); 1206 status_attr, NULL);
1310 if (preedit_attr) 1207 if (preedit_attr)
1311 XFree(preedit_attr); 1208 XFree(preedit_attr);
1312 if (status_attr) 1209 if (status_attr)
1313 XFree(status_attr); 1210 XFree(status_attr);
1314 if (R->Input_Context == NULL) { 1211 if (Input_Context == NULL) {
1315 rxvt_print_error("failed to create input context"); 1212 rxvt_print_error("failed to create input context");
1316 XCloseIM(xim); 1213 XCloseIM(xim);
1317 return False; 1214 return False;
1318 } 1215 }
1319 if (R->input_style & XIMPreeditArea) 1216 if (input_style & XIMPreeditArea)
1320 rxvt_IMSetStatusPosition(aR); 1217 IMSetStatusPosition ();
1321 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1218 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1322 return True; 1219 return True;
1323} 1220}
1324 1221
1222/*
1223 * X manual pages and include files don't match on some systems:
1224 * some think this is an XIDProc and others an XIMProc so we can't
1225 * use the first argument - need to update this to be nice for
1226 * both types via some sort of configure detection
1227 */
1228/* ARGSUSED */
1325/* EXTPROTO */ 1229/* EXTPROTO */
1326void 1230void
1231rxvt_IMInstantiateCallback(Display * unused
1232 __attribute__ ((unused)), XPointer client_data
1233 __attribute__ ((unused)), XPointer call_data
1234 __attribute__ ((unused)))
1235{
1236 int i, found, had_im;
1237 const char *p;
1238 char **s;
1239 char buf[IMBUFSIZ];
1240
1241 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1242 if (GET_R->Input_Context)
1243 return;
1244
1245#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1246 if (GET_R->rs[Rs_imLocale])
1247 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]);
1248#endif
1249
1250 p = GET_R->rs[Rs_inputMethod];
1251 if (p && *p)
1252 {
1253 bool found = false;
1254
1255 s = rxvt_splitcommastring (p);
1256 for (i = 0; s[i]; i++)
1257 {
1258 if (*s[i])
1259 {
1260 STRCPY (buf, "@im=");
1261 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1262 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ())
1263 {
1264 found = true;
1265 break;
1266 }
1267 }
1268 }
1269 for (i = 0; s[i]; i++)
1270 free(s[i]);
1271 free(s);
1272
1273 if (found)
1274 goto done;
1275 }
1276
1277/* try with XMODIFIERS env. var. */
1278 if ((p = XSetLocaleModifiers ("")) && *p
1279 && GET_R->IM_get_IC ())
1280 goto done;
1281
1282/* try with no modifiers base IF the user didn't specify an IM */
1283 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1284 && GET_R->IM_get_IC () == True)
1285 goto done;
1286
1287done:
1288#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1289 if (GET_R->rs[Rs_imLocale])
1290 setlocale (LC_CTYPE, GET_R->locale);
1291#endif
1292}
1293
1294void
1327rxvt_IMSetStatusPosition(pR) 1295rxvt_term::IMSetStatusPosition ()
1328{ 1296{
1329 XRectangle preedit_rect, status_rect, *needed_rect; 1297 XRectangle preedit_rect, status_rect, *needed_rect;
1330 XVaNestedList preedit_attr, status_attr; 1298 XVaNestedList preedit_attr, status_attr;
1331 1299
1332 if (R->Input_Context == NULL 1300 if (Input_Context == NULL
1333 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1301 || !TermWin.focus || !(input_style & XIMPreeditArea)
1334 || !rxvt_IMisRunning(aR)) 1302 || !IMisRunning ())
1335 return; 1303 return;
1336 1304
1337/* Getting the necessary width of preedit area */ 1305/* Getting the necessary width of preedit area */
1338 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1306 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1339 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1307 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1340 XFree(status_attr); 1308 XFree(status_attr);
1341 1309
1342 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1310 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1343 1311
1344 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1312 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1345 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1313 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1346 1314
1347 XSetICValues(R->Input_Context, 1315 XSetICValues(Input_Context,
1348 XNPreeditAttributes, preedit_attr, 1316 XNPreeditAttributes, preedit_attr,
1349 XNStatusAttributes, status_attr, NULL); 1317 XNStatusAttributes, status_attr, NULL);
1350 1318
1351 XFree(preedit_attr); 1319 XFree(preedit_attr);
1352 XFree(status_attr); 1320 XFree(status_attr);

Diff Legend

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