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.18 by pcg, Fri Dec 19 06:17:03 2003 UTC vs.
Revision 1.23 by pcg, Sat Jan 31 03:18:43 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.18 2003/12/19 06:17:03 pcg Exp $ 4 * $Id: main.C,v 1.23 2004/01/31 03:18:43 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
72{ 72{
73 free (p); 73 free (p);
74} 74}
75 75
76rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77: destroy_ev (this, &rxvt_term::destroy_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),
85 check_ev (this, &rxvt_term::check_cb), 87 check_ev (this, &rxvt_term::check_cb),
88 destroy_ev (this, &rxvt_term::destroy_cb),
89 pty_ev (this, &rxvt_term::pty_cb),
90 x_ev (this, &rxvt_term::x_cb),
86 incr_ev (this, &rxvt_term::incr_cb), 91 incr_ev (this, &rxvt_term::incr_cb)
87 pty_ev (this, &rxvt_term::pty_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
… …
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);
… …
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/*----------------------------------------------------------------------*/
… …
580 578
581 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 579 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
582 580
583 sb_w = mb_h = 0; 581 sb_w = mb_h = 0;
584 window_vt_x = window_vt_y = 0; 582 window_vt_x = window_vt_y = 0;
585 if (scrollbar_visible (this)) { 583 if (scrollbar_visible ()) {
586 sb_w = scrollbar_TotalWidth(); 584 sb_w = scrollbar_TotalWidth();
587 szHint.base_width += sb_w; 585 szHint.base_width += sb_w;
588 if (!(Options & Opt_scrollBar_right)) 586 if (!(Options & Opt_scrollBar_right))
589 window_vt_x = sb_w; 587 window_vt_x = sb_w;
590 } 588 }
591 if (menubar_visible (this)) { 589 if (menubar_visible ()) {
592 mb_h = menuBar_TotalHeight(); 590 mb_h = menuBar_TotalHeight();
593 szHint.base_height += mb_h; 591 szHint.base_height += mb_h;
594 window_vt_y = mb_h; 592 window_vt_y = mb_h;
595 } 593 }
596 szHint.width_inc = TermWin.fwidth; 594 szHint.width_inc = TermWin.fwidth;
… …
610 TermWin.height = height - szHint.base_height; 608 TermWin.height = height - szHint.base_height;
611 } else { 609 } else {
612 MIN_IT(TermWin.height, max_height); 610 MIN_IT(TermWin.height, max_height);
613 szHint.height = szHint.base_height + TermWin.height; 611 szHint.height = szHint.base_height + TermWin.height;
614 } 612 }
615 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right)) 613 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
616 window_sb_x = szHint.width - sb_w; 614 window_sb_x = szHint.width - sb_w;
617 615
618 if (recalc_x) 616 if (recalc_x)
619 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay)) 617 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
620 - szHint.width - 2 * TermWin.ext_bwidth); 618 - szHint.width - 2 * TermWin.ext_bwidth);
… …
636 * Called after a window size change. 634 * Called after a window size change.
637 */ 635 */
638void 636void
639rxvt_term::tt_winch () 637rxvt_term::tt_winch ()
640{ 638{
641 struct winsize ws; 639 struct winsize ws;
642 640
643 if (cmd_fd < 0) 641 if (cmd_fd < 0)
644 return; 642 return;
645 643
646 ws.ws_col = TermWin.ncol; 644 ws.ws_col = TermWin.ncol;
… …
664 * init = 1 - initialize 662 * init = 1 - initialize
665 * 663 *
666 * fontname == FONT_UP - switch to bigger font 664 * fontname == FONT_UP - switch to bigger font
667 * fontname == FONT_DN - switch to smaller font 665 * fontname == FONT_DN - switch to smaller font
668 */ 666 */
669/* EXTPROTO */
670void 667void
671rxvt_change_font(pR_ int init, const char *fontname) 668rxvt_term::change_font (int init, const char *fontname)
672{ 669{
673} 670}
674 671
675/* INTPROTO */
676void 672void
677rxvt_font_up_down(pR_ int n, int direction) 673rxvt_term::font_up_down (int n, int direction)
678{ 674{
679} 675}
680 676
681/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
682/*----------------------------------------------------------------------*/ 678/*----------------------------------------------------------------------*/
683/* xterm sequences - title, iconName, color (exptl) */ 679/* xterm sequences - title, iconName, color (exptl) */
684/* EXTPROTO */
685void 680void
686rxvt_set_title(pR_ const char *str) 681rxvt_term::set_title (const char *str)
687{ 682{
688#ifndef SMART_WINDOW_TITLE 683#ifndef SMART_WINDOW_TITLE
689 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 684 XStoreName(Xdisplay, TermWin.parent[0], str);
690#else 685#else
691 char *name; 686 char *name;
692 687
693 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 688 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
694 name = NULL; 689 name = NULL;
695 if (name == NULL || STRCMP(name, str)) 690 if (name == NULL || STRCMP(name, str))
696 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 691 XStoreName(Xdisplay, TermWin.parent[0], str);
697 if (name) 692 if (name)
698 XFree(name); 693 XFree(name);
699#endif 694#endif
700} 695}
701 696
702/* EXTPROTO */
703void 697void
704rxvt_set_iconName(pR_ const char *str) 698rxvt_term::set_iconName (const char *str)
705{ 699{
706#ifndef SMART_WINDOW_TITLE 700#ifndef SMART_WINDOW_TITLE
707 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 701 XSetIconName(Xdisplay, TermWin.parent[0], str);
708#else 702#else
709 char *name; 703 char *name;
710 704
711 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 705 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
712 name = NULL; 706 name = NULL;
713 if (name == NULL || STRCMP(name, str)) 707 if (name == NULL || STRCMP(name, str))
714 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 708 XSetIconName(Xdisplay, TermWin.parent[0], str);
715 if (name) 709 if (name)
716 XFree(name); 710 XFree(name);
717#endif 711#endif
718} 712}
719 713
720#ifdef XTERM_COLOR_CHANGE 714#ifdef XTERM_COLOR_CHANGE
721/* EXTPROTO */
722void 715void
723rxvt_set_window_color(pR_ int idx, const char *color) 716rxvt_term::set_window_color (int idx, const char *color)
724{ 717{
725 rxvt_color xcol; 718 rxvt_color xcol;
726 int i; 719 int i;
727 720
728 if (color == NULL || *color == '\0') 721 if (color == NULL || *color == '\0')
… …
732 if (isdigit(*color)) { 725 if (isdigit(*color)) {
733 i = atoi(color); 726 i = atoi(color);
734 if (i >= 8 && i <= 15) { /* bright colors */ 727 if (i >= 8 && i <= 15) { /* bright colors */
735 i -= 8; 728 i -= 8;
736# ifndef NO_BRIGHTCOLOR 729# ifndef NO_BRIGHTCOLOR
737 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 730 PixColors[idx] = PixColors[minBrightCOLOR + i];
738 SET_PIXCOLOR(R, idx); 731 SET_PIXCOLOR(idx);
739 goto Done; 732 goto Done;
740# endif 733# endif
741 } 734 }
742 if (i >= 0 && i <= 7) { /* normal colors */ 735 if (i >= 0 && i <= 7) { /* normal colors */
743 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 736 PixColors[idx] = PixColors[minCOLOR + i];
744 SET_PIXCOLOR(R, idx); 737 SET_PIXCOLOR(idx);
745 goto Done; 738 goto Done;
746 } 739 }
747 } 740 }
748 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 741 if (!rXParseAllocColor (& xcol, color))
749 return; 742 return;
750/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 743/* XStoreColor (Xdisplay, XCMAP, XColor*); */
751 744
752/* 745/*
753 * 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,
754 * so just keep gobbling up the colormap 747 * so just keep gobbling up the colormap
755 */ 748 */
756# if 0 749# if 0
757 for (i = Color_Black; i <= Color_White; i++) 750 for (i = Color_Black; i <= Color_White; i++)
758 if (R->PixColors[idx] == R->PixColors[i]) 751 if (PixColors[idx] == PixColors[i])
759 break; 752 break;
760 if (i > Color_White) { 753 if (i > Color_White) {
761 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 754 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
762 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 755 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
763 DisplayPlanes(R->Xdisplay, Xscreen)); 756 DisplayPlanes(Xdisplay, Xscreen));
764 } 757 }
765# endif 758# endif
766 759
767 R->PixColors[idx] = xcol; 760 PixColors[idx] = xcol;
768 SET_PIXCOLOR(R, idx); 761 SET_PIXCOLOR(idx);
769 762
770/* XSetWindowAttributes attr; */ 763/* XSetWindowAttributes attr; */
771/* Cursor cursor; */ 764/* Cursor cursor; */
772 Done: 765 Done:
773 if (idx == Color_bg && !(R->Options & Opt_transparent)) 766 if (idx == Color_bg && !(Options & Opt_transparent))
774 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 767 XSetWindowBackground(Xdisplay, TermWin.vt,
775 R->PixColors[Color_bg]); 768 PixColors[Color_bg]);
776 769
777/* handle Color_BD, scrollbar background, etc. */ 770/* handle Color_BD, scrollbar background, etc. */
778 771
779 rxvt_set_colorfgbg (aR); 772 set_colorfgbg ();
780 R->recolour_cursor (); 773 recolour_cursor ();
781/* the only reasonable way to enforce a clean update */ 774/* the only reasonable way to enforce a clean update */
782 rxvt_scr_poweron (aR); 775 scr_poweron ();
783} 776}
784 777
785#else 778#else
786# define rxvt_set_window_color(aR_ idx,color) ((void)0) 779# define set_window_color (idx,color) ((void)0)
787#endif /* XTERM_COLOR_CHANGE */ 780#endif /* XTERM_COLOR_CHANGE */
788 781
789void 782void
790rxvt_term::recolour_cursor () 783rxvt_term::recolour_cursor ()
791{ 784{
… …
801 794
802/*----------------------------------------------------------------------*/ 795/*----------------------------------------------------------------------*/
803/* 796/*
804 * 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
805 */ 798 */
806/* INTPROTO */
807void 799void
808rxvt_set_colorfgbg(pR) 800rxvt_term::set_colorfgbg ()
809{ 801{
810 unsigned int i; 802 unsigned int i;
811 const char *xpmb = "\0"; 803 const char *xpmb = "\0";
812 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 804 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
813 805
814 R->env_colorfgbg = 806 env_colorfgbg =
815 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 807 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
816 STRCPY(fstr, "default"); 808 STRCPY(fstr, "default");
817 STRCPY(bstr, "default"); 809 STRCPY(bstr, "default");
818 for (i = Color_Black; i <= Color_White; i++) 810 for (i = Color_Black; i <= Color_White; i++)
819 if (R->PixColors[Color_fg] == R->PixColors[i]) { 811 if (PixColors[Color_fg] == PixColors[i]) {
820 sprintf(fstr, "%d", (i - Color_Black)); 812 sprintf(fstr, "%d", (i - Color_Black));
821 break; 813 break;
822 } 814 }
823 for (i = Color_Black; i <= Color_White; i++) 815 for (i = Color_Black; i <= Color_White; i++)
824 if (R->PixColors[Color_bg] == R->PixColors[i]) { 816 if (PixColors[Color_bg] == PixColors[i]) {
825 sprintf(bstr, "%d", (i - Color_Black)); 817 sprintf(bstr, "%d", (i - Color_Black));
826#ifdef XPM_BACKGROUND 818#ifdef XPM_BACKGROUND
827 xpmb = "default;"; 819 xpmb = "default;";
828#endif 820#endif
829 break; 821 break;
830 } 822 }
831 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 823 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
832 putenv(R->env_colorfgbg); 824 putenv(env_colorfgbg);
833 825
834#ifndef NO_BRIGHTCOLOR 826#ifndef NO_BRIGHTCOLOR
835 R->colorfgbg = DEFAULT_RSTYLE; 827 colorfgbg = DEFAULT_RSTYLE;
836 for (i = minCOLOR; i <= maxCOLOR; i++) { 828 for (i = minCOLOR; i <= maxCOLOR; i++) {
837 if (R->PixColors[Color_fg] == R->PixColors[i]) 829 if (PixColors[Color_fg] == PixColors[i])
838 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 830 colorfgbg = SET_FGCOLOR(colorfgbg, i);
839 if (R->PixColors[Color_bg] == R->PixColors[i]) 831 if (PixColors[Color_bg] == PixColors[i])
840 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 832 colorfgbg = SET_BGCOLOR(colorfgbg, i);
841 } 833 }
842#endif 834#endif
843} 835}
844 836
845/*----------------------------------------------------------------------*/ 837/*----------------------------------------------------------------------*/
846/* 838/*
847 * Colour determination for low colour displays, routine from 839 * Colour determination for low colour displays, routine from
848 * Hans de Goede <hans@highrise.nl> 840 * Hans de Goede <hans@highrise.nl>
849 */ 841 */
850 842
851/* EXTPROTO */
852int 843int
853rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 844rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
854{ 845{
855 screen_in_out->set(aR_ colour);
856
857 if (!screen_in_out->set(aR_ colour)) { 846 if (!screen_in_out->set (this, colour)) {
858 rxvt_print_error("can't allocate colour: %s", colour); 847 rxvt_print_error("can't allocate colour: %s", colour);
859 return false; 848 return false;
860 } 849 }
861 850
862 return true; 851 return true;
… …
927 fix_screen = (TermWin.ncol != prev_ncol 916 fix_screen = (TermWin.ncol != prev_ncol
928 || TermWin.nrow != prev_nrow); 917 || TermWin.nrow != prev_nrow);
929 918
930 if (fix_screen || width != old_width || height != old_height) 919 if (fix_screen || width != old_width || height != old_height)
931 { 920 {
932 if (scrollbar_visible (this)) 921 if (scrollbar_visible ())
933 { 922 {
934 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x, 923 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
935 0, scrollbar_TotalWidth (), szHint.height); 924 0, scrollbar_TotalWidth (), szHint.height);
936 resize_scrollbar (); 925 resize_scrollbar ();
937 } 926 }
938 927
939 if (menubar_visible (this)) 928 if (menubar_visible ())
940 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x, 929 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
941 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 930 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
942 931
943 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x, 932 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
944 window_vt_y, TermWin_TotalWidth (), 933 window_vt_y, TermWin_TotalWidth (),
945 TermWin_TotalHeight ()); 934 TermWin_TotalHeight ());
946#ifdef RXVT_GRAPHICS 935#ifdef RXVT_GRAPHICS
947 if (old_height) 936 if (old_height)
948 rxvt_Gr_Resize (this, old_width - szHint.base_width, 937 Gr_Resize (old_width - szHint.base_width,
949 old_height - szHint.base_height); 938 old_height - szHint.base_height);
950#endif 939#endif
951 scr_clear (); 940 scr_clear ();
952#ifdef XPM_BACKGROUND 941#ifdef XPM_BACKGROUND
953 rxvt_resize_pixmap (this); 942 resize_pixmap ();
954#endif 943#endif
955 } 944 }
956 945
957 if (fix_screen || old_height == 0) 946 if (fix_screen || old_height == 0)
958 { 947 {
959 int curr_screen = -1; 948 int curr_screen = -1;
960 uint16_t old_ncol = prev_ncol; 949 int old_ncol = prev_ncol;
961 950
962 /* scr_reset only works on the primary screen */ 951 /* scr_reset only works on the primary screen */
963 if (old_height) /* this is not the first time through */ 952 if (old_height) /* this is not the first time through */
953 {
954 unsigned int ncol = TermWin.ncol;
955 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
964 curr_screen = rxvt_scr_change_screen (this, PRIMARY); 956 curr_screen = scr_change_screen (PRIMARY);
957 TermWin.ncol = ncol;
958 }
965 959
966 scr_reset(); 960 scr_reset();
967 961
968 if (curr_screen >= 0) /* this is not the first time through */ 962 if (curr_screen >= 0) /* this is not the first time through */
969 { 963 {
970 rxvt_scr_change_screen (this, curr_screen); 964 scr_change_screen (curr_screen);
971 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0); 965 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
972 } 966 }
973 } 967 }
974 968
975 old_width = szHint.width; 969 old_width = szHint.width;
976 old_height = szHint.height; 970 old_height = szHint.height;
977 971
978#ifdef USE_XIM 972#ifdef USE_XIM
979 rxvt_IMSetStatusPosition (this); 973 IMSetStatusPosition ();
980#endif 974#endif
981} 975}
982 976
983/* 977/*
984 * Set the width/height of the vt window in characters. Units are pixels. 978 * Set the width/height of the vt window in characters. Units are pixels.
985 * good for toggling 80/132 columns 979 * good for toggling 80/132 columns
986 */ 980 */
987/* EXTPROTO */
988void 981void
989rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 982rxvt_term::set_widthheight (unsigned int width, unsigned int height)
990{ 983{
991 XWindowAttributes wattr; 984 XWindowAttributes wattr;
992 985
993 if (width == 0 || height == 0) { 986 if (width == 0 || height == 0) {
994 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 987 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
995 if (width == 0) 988 if (width == 0)
996 width = wattr.width - R->szHint.base_width; 989 width = wattr.width - szHint.base_width;
997 if (height == 0) 990 if (height == 0)
998 height = wattr.height - R->szHint.base_height; 991 height = wattr.height - szHint.base_height;
999 } 992 }
1000 if (width != R->TermWin.width || height != R->TermWin.height) { 993 if (width != TermWin.width || height != TermWin.height) {
1001 width += R->szHint.base_width; 994 width += szHint.base_width;
1002 height += R->szHint.base_height; 995 height += szHint.base_height;
1003 R->resize_all_windows (width, height, 0); 996 resize_all_windows (width, height, 0);
1004 } 997 }
1005} 998}
1006 999
1007/* -------------------------------------------------------------------- * 1000/* -------------------------------------------------------------------- *
1008 * - X INPUT METHOD ROUTINES - * 1001 * - X INPUT METHOD ROUTINES - *
… …
1023 *fg = PixColors[Color_fg]; 1016 *fg = PixColors[Color_fg];
1024 *bg = PixColors[Color_bg]; 1017 *bg = PixColors[Color_bg];
1025} 1018}
1026 1019
1027/* Checking whether input method is running. */ 1020/* Checking whether input method is running. */
1028/* INTPROTO */
1029Bool 1021bool
1030rxvt_IMisRunning(pR) 1022rxvt_term::IMisRunning ()
1031{ 1023{
1032 char *p; 1024 char *p;
1033 Atom atom; 1025 Atom atom;
1034 Window win; 1026 Window win;
1035 char server[IMBUFSIZ]; 1027 char server[IMBUFSIZ];
… …
1039 STRCPY(server, "@server="); 1031 STRCPY(server, "@server=");
1040 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1032 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1041 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1033 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1042 *p = '\0'; 1034 *p = '\0';
1043 1035
1044 atom = XInternAtom(R->Xdisplay, server, False); 1036 atom = XInternAtom(Xdisplay, server, False);
1045 win = XGetSelectionOwner(R->Xdisplay, atom); 1037 win = XGetSelectionOwner(Xdisplay, atom);
1046 if (win != None) 1038 if (win != None)
1047 return True; 1039 return True;
1048 } 1040 }
1049 return False; 1041 return False;
1050} 1042}
1051 1043
1052/* EXTPROTO */
1053void 1044void
1054rxvt_IMSendSpot(pR) 1045rxvt_term::IMSendSpot ()
1055{ 1046{
1056 XPoint spot; 1047 XPoint spot;
1057 XVaNestedList preedit_attr; 1048 XVaNestedList preedit_attr;
1058 1049
1059 if (R->Input_Context == NULL 1050 if (Input_Context == NULL
1060 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1051 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1061 || !(R->event_type == KeyPress 1052 || !(event_type == KeyPress
1062 || R->event_type == Expose 1053 || event_type == Expose
1063 || R->event_type == NoExpose 1054 || event_type == NoExpose
1064 || R->event_type == SelectionNotify 1055 || event_type == SelectionNotify
1065 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1056 || event_type == ButtonRelease || event_type == FocusIn)
1066 || !rxvt_IMisRunning(aR)) 1057 || !IMisRunning ())
1067 return; 1058 return;
1068 1059
1069 R->set_position (&spot); 1060 set_position (&spot);
1070 1061
1071 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1062 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1072 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1063 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1073 XFree(preedit_attr); 1064 XFree(preedit_attr);
1074} 1065}
1075 1066
1076void 1067void
1077rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1068rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1078 XRectangle * needed_rect) 1069 XRectangle * needed_rect)
1079{ 1070{
1080 int mbh, vtx = 0; 1071 int mbh, vtx = 0;
1081 1072
1082 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right)) 1073 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1083 vtx = scrollbar_TotalWidth(); 1074 vtx = scrollbar_TotalWidth();
1084 1075
1085 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0; 1076 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1086 mbh -= TermWin.lineSpace; 1077 mbh -= TermWin.lineSpace;
1087 1078
1088 preedit_rect->x = needed_rect->width + vtx; 1079 preedit_rect->x = needed_rect->width + vtx;
1089 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1080 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1090 1081
… …
1097 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1088 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1098 status_rect->height = Height2Pixel(1); 1089 status_rect->height = Height2Pixel(1);
1099} 1090}
1100 1091
1101/* ARGSUSED */ 1092/* ARGSUSED */
1102/* INTPROTO */ 1093/* EXTPROTO */
1103void 1094void
1104rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1105 __attribute__ ((unused)), XPointer call_data 1096 __attribute__ ((unused)), XPointer call_data
1106 __attribute__ ((unused))) 1097 __attribute__ ((unused)))
1107{ 1098{
1108 dR;
1109
1110 R->Input_Context = NULL; 1099 GET_R->Input_Context = NULL;
1111/* To avoid Segmentation Fault in C locale: Solaris only? */ 1100/* To avoid Segmentation Fault in C locale: Solaris only? */
1112 if (STRCMP(R->locale, "C")) 1101 if (STRCMP (GET_R->locale, "C"))
1113 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1102 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1114 rxvt_IMInstantiateCallback, NULL); 1103 rxvt_IMInstantiateCallback, NULL);
1115} 1104}
1116 1105
1117/* 1106/*
1118 * 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
1119 * open a suitable preedit type 1108 * open a suitable preedit type
1120 */ 1109 */
1121static Bool 1110bool
1122rxvt_IM_get_IC (pR) 1111rxvt_term::IM_get_IC ()
1123{ 1112{
1124 int i, j, found; 1113 int i, j, found;
1125 XIM xim; 1114 XIM xim;
1126 XPoint spot; 1115 XPoint spot;
1127 XRectangle rect, status_rect, needed_rect; 1116 XRectangle rect, status_rect, needed_rect;
… …
1131 XIMStyles *xim_styles; 1120 XIMStyles *xim_styles;
1132 XVaNestedList preedit_attr, status_attr; 1121 XVaNestedList preedit_attr, status_attr;
1133 XIMCallback ximcallback; 1122 XIMCallback ximcallback;
1134 1123
1135 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1124 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1136 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL); 1125 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1137 if (xim == NULL) 1126 if (xim == NULL)
1138 return False; 1127 return False;
1139 1128
1140 xim_styles = NULL; 1129 xim_styles = NULL;
1141 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1130 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1142 || !xim_styles || !xim_styles->count_styles) { 1131 || !xim_styles || !xim_styles->count_styles) {
1143 XCloseIM(xim); 1132 XCloseIM(xim);
1144 return False; 1133 return False;
1145 } 1134 }
1146 1135
1147 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1136 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1148 : "OverTheSpot,OffTheSpot,Root"; 1137 : "OverTheSpot,OffTheSpot,Root";
1149 s = rxvt_splitcommastring(p); 1138 s = rxvt_splitcommastring(p);
1150 for (i = found = 0; !found && s[i]; i++) { 1139 for (i = found = 0; !found && s[i]; i++) {
1151 if (!STRCMP(s[i], "OverTheSpot")) 1140 if (!STRCMP(s[i], "OverTheSpot"))
1152 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1141 input_style = (XIMPreeditPosition | XIMStatusNothing);
1153 else if (!STRCMP(s[i], "OffTheSpot")) 1142 else if (!STRCMP(s[i], "OffTheSpot"))
1154 R->input_style = (XIMPreeditArea | XIMStatusArea); 1143 input_style = (XIMPreeditArea | XIMStatusArea);
1155 else if (!STRCMP(s[i], "Root")) 1144 else if (!STRCMP(s[i], "Root"))
1156 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1145 input_style = (XIMPreeditNothing | XIMStatusNothing);
1157 1146
1158 for (j = 0; j < xim_styles->count_styles; j++) 1147 for (j = 0; j < xim_styles->count_styles; j++)
1159 if (R->input_style == xim_styles->supported_styles[j]) { 1148 if (input_style == xim_styles->supported_styles[j]) {
1160 found = 1; 1149 found = 1;
1161 break; 1150 break;
1162 } 1151 }
1163 } 1152 }
1164 for (i = 0; s[i]; i++) 1153 for (i = 0; s[i]; i++)
… …
1176 /* 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) */
1177 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1166 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1178 1167
1179 preedit_attr = status_attr = NULL; 1168 preedit_attr = status_attr = NULL;
1180 1169
1181 if (R->input_style & XIMPreeditPosition) { 1170 if (input_style & XIMPreeditPosition) {
1182 R->set_size (&rect); 1171 set_size (&rect);
1183 R->set_position (&spot); 1172 set_position (&spot);
1184 R->set_color (&fg, &bg); 1173 set_color (&fg, &bg);
1185 1174
1186 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1175 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1187 XNSpotLocation, &spot, 1176 XNSpotLocation, &spot,
1188 XNForeground, fg, XNBackground, bg, 1177 XNForeground, fg, XNBackground, bg,
1189 //XNFontSet, R->TermWin.fontset, 1178 //XNFontSet, TermWin.fontset,
1190 NULL); 1179 NULL);
1191 } else if (R->input_style & XIMPreeditArea) { 1180 } else if (input_style & XIMPreeditArea) {
1192 R->set_color (&fg, &bg); 1181 set_color (&fg, &bg);
1193 1182
1194 /* 1183 /*
1195 * The necessary width of preedit area is unknown 1184 * The necessary width of preedit area is unknown
1196 * until create input context. 1185 * until create input context.
1197 */ 1186 */
1198 needed_rect.width = 0; 1187 needed_rect.width = 0;
1199 1188
1200 R->set_preedit_area(&rect, &status_rect, &needed_rect); 1189 set_preedit_area(&rect, &status_rect, &needed_rect);
1201 1190
1202 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1191 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1203 XNForeground, fg, XNBackground, bg, 1192 XNForeground, fg, XNBackground, bg,
1204 //XNFontSet, R->TermWin.fontset, 1193 //XNFontSet, TermWin.fontset,
1205 NULL); 1194 NULL);
1206 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1195 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1207 XNForeground, fg, XNBackground, bg, 1196 XNForeground, fg, XNBackground, bg,
1208 //XNFontSet, R->TermWin.fontset, 1197 //XNFontSet, TermWin.fontset,
1209 NULL); 1198 NULL);
1210 } 1199 }
1211 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1200 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1212 XNClientWindow, R->TermWin.parent[0], 1201 XNClientWindow, TermWin.parent[0],
1213 XNFocusWindow, R->TermWin.parent[0], 1202 XNFocusWindow, TermWin.parent[0],
1214 XNDestroyCallback, &ximcallback, 1203 XNDestroyCallback, &ximcallback,
1215 preedit_attr ? XNPreeditAttributes : NULL, 1204 preedit_attr ? XNPreeditAttributes : NULL,
1216 preedit_attr, 1205 preedit_attr,
1217 status_attr ? XNStatusAttributes : NULL, 1206 status_attr ? XNStatusAttributes : NULL,
1218 status_attr, NULL); 1207 status_attr, NULL);
1219 if (preedit_attr) 1208 if (preedit_attr)
1220 XFree(preedit_attr); 1209 XFree(preedit_attr);
1221 if (status_attr) 1210 if (status_attr)
1222 XFree(status_attr); 1211 XFree(status_attr);
1223 if (R->Input_Context == NULL) { 1212 if (Input_Context == NULL) {
1224 rxvt_print_error("failed to create input context"); 1213 rxvt_print_error("failed to create input context");
1225 XCloseIM(xim); 1214 XCloseIM(xim);
1226 return False; 1215 return False;
1227 } 1216 }
1228 if (R->input_style & XIMPreeditArea) 1217 if (input_style & XIMPreeditArea)
1229 rxvt_IMSetStatusPosition(aR); 1218 IMSetStatusPosition ();
1230 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1219 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1231 return True; 1220 return True;
1232} 1221}
1233 1222
1234/* 1223/*
… …
1243rxvt_IMInstantiateCallback(Display * unused 1232rxvt_IMInstantiateCallback(Display * unused
1244 __attribute__ ((unused)), XPointer client_data 1233 __attribute__ ((unused)), XPointer client_data
1245 __attribute__ ((unused)), XPointer call_data 1234 __attribute__ ((unused)), XPointer call_data
1246 __attribute__ ((unused))) 1235 __attribute__ ((unused)))
1247{ 1236{
1248 dR;
1249 int i, found, had_im; 1237 int i, found, had_im;
1250 const char *p; 1238 const char *p;
1251 char **s; 1239 char **s;
1252 char buf[IMBUFSIZ]; 1240 char buf[IMBUFSIZ];
1253 1241
1254 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1242 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1255 if (R->Input_Context) 1243 if (GET_R->Input_Context)
1256 return; 1244 return;
1257 1245
1258#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1246#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1259 if (R->rs[Rs_imLocale]) 1247 if (GET_R->rs[Rs_imLocale])
1260 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1248 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]);
1261#endif 1249#endif
1262 1250
1263 p = R->rs[Rs_inputMethod]; 1251 p = GET_R->rs[Rs_inputMethod];
1264 if (p && *p) 1252 if (p && *p)
1265 { 1253 {
1266 bool found = false; 1254 bool found = false;
1267 1255
1268 s = rxvt_splitcommastring (p); 1256 s = rxvt_splitcommastring (p);
… …
1270 { 1258 {
1271 if (*s[i]) 1259 if (*s[i])
1272 { 1260 {
1273 STRCPY (buf, "@im="); 1261 STRCPY (buf, "@im=");
1274 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1262 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1275 if ((p = XSetLocaleModifiers (buf)) && *p 1263 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ())
1276 && rxvt_IM_get_IC (aR))
1277 { 1264 {
1278 found = true; 1265 found = true;
1279 break; 1266 break;
1280 } 1267 }
1281 } 1268 }
… …
1288 goto done; 1275 goto done;
1289 } 1276 }
1290 1277
1291/* try with XMODIFIERS env. var. */ 1278/* try with XMODIFIERS env. var. */
1292 if ((p = XSetLocaleModifiers ("")) && *p 1279 if ((p = XSetLocaleModifiers ("")) && *p
1293 && rxvt_IM_get_IC (aR)) 1280 && GET_R->IM_get_IC ())
1294 goto done; 1281 goto done;
1295 1282
1296/* 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 */
1297 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1284 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1298 && rxvt_IM_get_IC (aR) == True) 1285 && GET_R->IM_get_IC () == True)
1299 goto done; 1286 goto done;
1300 1287
1301done: 1288done:
1302#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1289#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1303 if (R->rs[Rs_imLocale]) 1290 if (GET_R->rs[Rs_imLocale])
1304 setlocale (LC_CTYPE, R->locale); 1291 setlocale (LC_CTYPE, GET_R->locale);
1305#endif 1292#endif
1306} 1293}
1307 1294
1308/* EXTPROTO */
1309void 1295void
1310rxvt_IMSetStatusPosition(pR) 1296rxvt_term::IMSetStatusPosition ()
1311{ 1297{
1312 XRectangle preedit_rect, status_rect, *needed_rect; 1298 XRectangle preedit_rect, status_rect, *needed_rect;
1313 XVaNestedList preedit_attr, status_attr; 1299 XVaNestedList preedit_attr, status_attr;
1314 1300
1315 if (R->Input_Context == NULL 1301 if (Input_Context == NULL
1316 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1302 || !TermWin.focus || !(input_style & XIMPreeditArea)
1317 || !rxvt_IMisRunning(aR)) 1303 || !IMisRunning ())
1318 return; 1304 return;
1319 1305
1320/* Getting the necessary width of preedit area */ 1306/* Getting the necessary width of preedit area */
1321 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1307 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1322 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1308 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1323 XFree(status_attr); 1309 XFree(status_attr);
1324 1310
1325 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1311 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1326 1312
1327 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1313 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1328 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1314 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1329 1315
1330 XSetICValues(R->Input_Context, 1316 XSetICValues(Input_Context,
1331 XNPreeditAttributes, preedit_attr, 1317 XNPreeditAttributes, preedit_attr,
1332 XNStatusAttributes, status_attr, NULL); 1318 XNStatusAttributes, status_attr, NULL);
1333 1319
1334 XFree(preedit_attr); 1320 XFree(preedit_attr);
1335 XFree(status_attr); 1321 XFree(status_attr);

Diff Legend

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