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

Diff Legend

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