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.25 by pcg, Sat Jan 31 03:27:45 2004 UTC

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

Diff Legend

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