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

Diff Legend

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