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

Diff Legend

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