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.22 by pcg, Sat Jan 31 00:20:21 2004 UTC

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

Diff Legend

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