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

Diff Legend

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