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.188 by root, Wed Jan 18 08:33:34 2006 UTC vs.
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66void 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
167 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 171#endif
169#ifdef USE_XIM 172#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
171#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
172 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
174 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
181 188
182 termlist.push_back (this); 189 termlist.push_back (this);
183 190
184#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 193#endif
190} 194}
191 195
192// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
193// for use before an emergency exit 197// for use before an emergency exit
… …
199 delete pty; pty = 0; 203 delete pty; pty = 0;
200} 204}
201 205
202rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
203{ 207{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 209
208 emergency_cleanup (); 210 emergency_cleanup ();
209 211
210#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
214#endif 216#endif
215 delete fontset[0]; 217 delete fontset[0];
216 218
217 if (display) 219 if (display)
218 { 220 {
219 dDisp;
220
221 selection_clear (); 221 selection_clear ();
222 222
223#ifdef USE_XIM 223#ifdef USE_XIM
224 im_destroy (); 224 im_destroy ();
225#endif 225#endif
226#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
229#endif 229#endif
230#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
232#endif 232#endif
233#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
244#endif 244#endif
245#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
249#endif 249#endif
250 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
251 251
252 delete drawable; 252 delete drawable;
253 // destroy all windows 253 // destroy all windows
254 if (parent[0]) 254 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256 }
257 256
258 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
259 delete pix_colors_focused; 269 delete pix_colors_focused;
260#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
261 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
262#endif 272#endif
263 273
… …
269 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 280 free (allocated [i]);
271 281
272 free (selection.text); 282 free (selection.text);
273 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 284 free (env_display);
276 free (env_term); 285 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 286 free (locale);
279 free (v_buffer); 287 free (v_buffer);
280 free (incr_buf); 288 free (incr_buf);
281 289
282 delete envv; 290 delete envv;
… …
285#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
286 delete keyboard; 294 delete keyboard;
287#endif 295#endif
288} 296}
289 297
298// child has exited, usually destroys
290void 299void
291rxvt_term::child_exit () 300rxvt_term::child_cb (child_watcher &w, int status)
292{ 301{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303
293 cmd_pid = 0; 304 cmd_pid = 0;
294 305
295 if (!OPTION (Opt_hold)) 306 if (!OPTION (Opt_hold))
296 destroy (); 307 destroy ();
297} 308}
… …
299void 310void
300rxvt_term::destroy () 311rxvt_term::destroy ()
301{ 312{
302 if (destroy_ev.active) 313 if (destroy_ev.active)
303 return; 314 return;
315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
304 317
305#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
306 scr_overlay_off (); 319 scr_overlay_off ();
307#endif 320#endif
308 321
… …
363{ 376{
364 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
366} 379}
367 380
368#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
369static void 382static void
370print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
371{ 384{
372 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
373 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
421 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
422 else 435 else
423 { 436 {
424 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
425 // so just output the error and continue 438 // so just output the error and continue
426#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
427 print_x_error (display, event); 442 print_x_error (display, event);
428#else
429 old_xerror_handler (display, event);
430#endif 443#endif
431 } 444 }
432 445
433 return 0; 446 return 0;
434} 447}
… …
442 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
443} 456}
444 457
445/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
446bool 459bool
447rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 461{
462 this->envv = envv;
463
449 SET_R (this); 464 SET_R (this);
450 set_locale (""); 465 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 466 set_environ (envv); // few things in X do not call setlocale :(
452 467
453 if (!init_vars ()) 468 if (!init_vars ())
… …
464#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 482#endif
468 483
469#if ENABLE_PERL 484 pty = ptytty::create ();
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483 485
484 create_windows (argc, argv); 486 create_windows (argc, argv);
485 487
486 dDisp;
487
488 init_xlocale (); 488 init_xlocale ();
489 489
490 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
491 491
492#if 0 492#if 0
493 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
494#endif 494#endif
495 495
496#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
499#endif 499#endif
500#ifdef TRANSPARENT 500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
502 { 502 {
503 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
504 check_our_parents (); 504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
506 } 506 }
507#endif 507#endif
508 508
509 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]);
511
512 set_colorfgbg (); 509 set_colorfgbg ();
513 510
514 init_command (cmd_argv); 511 init_command (cmd_argv);
515 512
516 free (cmd_argv); 513 free (cmd_argv);
… …
520 517
521 check_ev.start (); 518 check_ev.start ();
522 519
523 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
524 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (xdisp, vt);
533 XMapWindow (xdisp, parent[0]);
534
525 return true; 535 return true;
526} 536}
527 537
528static struct sig_handlers 538static struct sig_handlers
529{ 539{
530 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
531 541
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545
546 /* 542 /*
547 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
548 */ 544 */
549 void 545 void
550 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
551 { 547 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
558 } 551 }
559 552
560 sig_handlers () 553 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
564 { 556 {
565 } 557 }
566} sig_handlers; 558} sig_handlers;
567 559
568char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
569 561
570void 562void
571rxvt_init () 563rxvt_init ()
572{ 564{
573 uid_t uid = getuid (); 565 ptytty::init ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || gid != getegid ())
580 {
581#if PTYTTY_HELPER
582 rxvt_ptytty_server ();
583#else
584 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
586
587 // drop privileges
588#if HAVE_SETRESUID
589 setresgid (gid, gid, gid);
590 setresuid (uid, uid, uid);
591#elif HAVE_SETREUID
592 setregid (gid, gid);
593 setreuid (uid, uid);
594#elif HAVE_SETUID
595 setgid (gid);
596 setuid (uid);
597#endif
598
599 if (uid != geteuid ()
600 || gid != getegid ())
601 rxvt_fatal ("unable to drop privileges, aborting.\n");
602 }
603 566
604 rxvt_environ = environ; 567 rxvt_environ = environ;
605 568
606 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
607 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
608 571
609 sig_handlers.sw_chld.start (SIGCHLD);
610 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
611 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
612 574
613 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
614 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
… …
643 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
644 606
645 return p; 607 return p;
646} 608}
647 609
648void * 610void *
649rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
650{ 612{
651 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
652 614
653 if (!p) 615 if (!p)
… …
666{ 628{
667 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
668 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
669 unsigned int w, h; 631 unsigned int w, h;
670 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
671 dDisp;
672
673 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
674 ncol, nrow, szHint.width, szHint.height));
675 633
676 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
677 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
678 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
679 637
… …
741 699
742 if (scrollBar.state) 700 if (scrollBar.state)
743 { 701 {
744 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
745 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
746 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
747 window_vt_x += sb_w; 706 window_vt_x += sb_w;
748 } 707 }
749 708
750 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
… …
776 735
777 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
778 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
779 738
780 if (recalc_x) 739 if (recalc_x)
781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
782 if (recalc_y) 742 if (recalc_y)
783 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
784 744
785 ncol = width / fwidth; 745 ncol = width / fwidth;
786 nrow = height / fheight; 746 nrow = height / fheight;
787 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
788 ncol, nrow, szHint.width,
789 szHint.height));
790 return;
791} 747}
792 748
793/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
794/* 750/*
795 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
… …
895 return true; 851 return true;
896} 852}
897 853
898void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
899{ 855{
900 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
901 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
902 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
903} 859}
904 860
905void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
906{ 862{
907 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
908 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
909 865
910 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
911 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
912 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
913 869
914 free (s); 870 free (s);
915 free (ws); 871 free (ws);
… …
940void 896void
941rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
942{ 898{
943 rxvt_color xcol; 899 rxvt_color xcol;
944 int i; 900 int i;
945 901
946 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
947 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
948 908
949 /* handle color aliases */ 909 /* handle color aliases */
950 if (isdigit (*color)) 910 if (isdigit (*color))
951 { 911 {
952 i = atoi (color); 912 i = atoi (color);
953 913
954 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
955 { /* bright colors */ 915 { /* bright colors */
956 i -= 8; 916 i -= 8;
957 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
958 SET_PIXCOLOR (idx);
959 goto done; 918 goto done;
960 } 919 }
961 920
962 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
963 { /* normal colors */ 922 { /* normal colors */
964 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
965 SET_PIXCOLOR (idx);
966 goto done; 924 goto done;
967 } 925 }
968 } 926 }
969 927
970 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
971 return;
972
973 /* XStoreColor (display->display, display->cmap, XColor*); */
974 929
975 /* 930 /*
976 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
977 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
978 */ 933 */
979# if 0
980 for (i = Color_Black; i <= Color_White; i++)
981 if (pix_colors[idx] == pix_colors[i])
982 break;
983 if (i > Color_White)
984 {
985 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
986 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
987 DisplayPlanes (display->display, display->screen));
988 }
989# endif
990 934
991 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
992 SET_PIXCOLOR (idx);
993 936
994 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
995 /* Cursor cursor; */ 938 /* Cursor cursor; */
996done: 939done:
997 940
998#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
999 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1000 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
1001#endif 948#endif
1002 949
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 951
1005 recolour_cursor (); 952 recolour_cursor ();
… …
1011#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1012 959
1013void 960void
1014rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1015{ 962{
1016 XColor xcol[2]; 963 XColor fg, bg;
1017 964
1018 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1019 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1020 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1021 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1022 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1023 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1024 972
1025 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1026 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1027} 974}
1028 975
1029/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1030/* 977/*
1031 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1035{ 982{
1036 unsigned int i; 983 unsigned int i;
1037 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1039 986
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1041 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1042 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1045 { 991 {
… …
1060 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1061} 1007}
1062 1008
1063/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1064 1010
1065int 1011bool
1066rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1067{ 1013{
1068 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1069 {
1070 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1071 return false;
1072 }
1073
1074 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1075} 1025}
1076 1026
1077/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1078 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1079 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1080void 1030void
1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1082{ 1032{
1083 int fix_screen; 1033 int fix_screen;
1084 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1085 dDisp; 1035 int old_height = szHint.height;
1086 1036
1087 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1088 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1089 1039
1090 if (!ignoreparent) 1040 if (!ignoreparent)
1091 { 1041 {
1092#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1093 /* 1043 /*
… …
1097 int x, y, x1, y1; 1047 int x, y, x1, y1;
1098 int dx, dy; 1048 int dx, dy;
1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100 Window unused_cr; 1050 Window unused_cr;
1101 1051
1102 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1103 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1104 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106 /* 1056 /*
1107 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1108 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1109 */ 1059 */
… …
1111 { 1061 {
1112 x -= x1; 1062 x -= x1;
1113 y -= y1; 1063 y -= y1;
1114 } 1064 }
1115 1065
1116 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1117 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1118 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1119 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1120 1070
1121 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1122 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1123 dx = 0; 1073 dx = 0;
… …
1126 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1127 dy = 0; 1077 dy = 0;
1128 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1129 dy /= 2; 1079 dy /= 2;
1130 1080
1131 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1132 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1133#else 1083#else
1134 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1135#endif 1085#endif
1136 } 1086 }
1137 1087
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 1089
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 1091 {
1142 if (scrollBar.state) 1092 if (scrollBar.state)
1143 { 1093 {
1144 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1145 window_sb_x, 0, 1095 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar (); 1097 resize_scrollbar ();
1148 } 1098 }
1149 1099
1150 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1151 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1152 width, height); 1102 width, height);
1153 1103
1154 scr_clear (); 1104 scr_clear ();
1155#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1156 resize_pixmap (); 1106 resize_pixmap ();
1157#endif 1107#endif
1158 } 1108 }
1159 1109
1160 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1161 {
1162 int curr_screen = -1;
1163 int old_ncol = prev_ncol;
1164
1165 /* scr_reset only works on the primary screen */
1166 if (old_height) /* this is not the first time through */
1167 {
1168 unsigned int ocol = ncol;
1169 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1170 curr_screen = scr_change_screen (PRIMARY);
1171 ncol = ocol;
1172 }
1173
1174 scr_reset (); 1111 scr_reset ();
1175 1112
1176 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1177 { 1114 //scr_touch (false);
1178 scr_change_screen (curr_screen);
1179 selection_check (old_ncol != ncol ? 4 : 0);
1180 }
1181 }
1182
1183 old_width = szHint.width;
1184 old_height = szHint.height;
1185 1115
1186#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1187 if (pixmap) 1117 if (pixmap)
1188 scr_touch (false); 1118 scr_touch (false);
1189#endif 1119#endif
… …
1202{ 1132{
1203 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1204 1134
1205 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1206 { 1136 {
1207 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (xdisp, display->root, &wattr);
1208 1138
1209 if (newwidth == 0) 1139 if (newwidth == 0)
1210 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1211 if (newheight == 0) 1141 if (newheight == 0)
1212 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1226#ifdef USE_XIM 1156#ifdef USE_XIM
1227 1157
1228void 1158void
1229rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1230{ 1160{
1231 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1232 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1233} 1163}
1234 1164
1235void 1165void
1236rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1237{ 1167{
… …
1274 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1275 1205
1276 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1277 *p = '\0'; 1207 *p = '\0';
1278 1208
1279 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (xdisp, server, False);
1280 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (xdisp, atom);
1281 1211
1282 if (win != None) 1212 if (win != None)
1283 return True; 1213 return True;
1284 } 1214 }
1285 1215
… …
1292 XPoint nspot; 1222 XPoint nspot;
1293 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1294 1224
1295 if (!Input_Context 1225 if (!Input_Context
1296 || !focus 1226 || !focus
1297 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1298 return; 1228 return;
1299 1229
1300 im_set_position (nspot); 1230 im_set_position (nspot);
1301 1231
1302 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1321 input_method = 0; 1251 input_method = 0;
1322 } 1252 }
1323 1253
1324 Input_Context = 0; 1254 Input_Context = 0;
1325} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1268{
1269 ((rxvt_term *)client_data)->make_current ();
1270 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1326 1330
1327/* 1331/*
1328 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1329 * open a suitable preedit type 1333 * open a suitable preedit type
1330 */ 1334 */
… …
1337 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1338 unsigned long fg, bg; 1342 unsigned long fg, bg;
1339 const char *p; 1343 const char *p;
1340 char **s; 1344 char **s;
1341 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1342 1349
1343 set_environ (envv); 1350 set_environ (envv);
1344 1351
1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1346 return false; 1353 return false;
1347 1354
1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1349 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1350 if (input_method == NULL) 1356 if (input_method == NULL)
1351 return false; 1357 return false;
1352 1358
1353 xim = input_method->xim; 1359 xim = input_method->xim;
… …
1373 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1374 1380
1375 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1376 { 1382 {
1377 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1378 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1379 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1380 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1381 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1382 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1383 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1384 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1385 1397
1386 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1387 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1388 { 1400 {
1389 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
… …
1427 "*", 1439 "*",
1428 fheight, 1440 fheight,
1429 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1430 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1431 1443
1432 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1433 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1434 1446
1435 if (missing_charset_list) 1447 if (missing_charset_list)
1436 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1437 1449
… …
1478 XNBackground, bg, 1490 XNBackground, bg,
1479 XNArea, &status_rect, 1491 XNArea, &status_rect,
1480 XNFontSet, fs, 1492 XNFontSet, fs,
1481 NULL); 1493 NULL);
1482 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1483 1518
1484 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1485 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1486 XNClientWindow, vt, 1521 XNClientWindow, vt,
1487 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
… …
1490 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1491 status_attr, NULL); 1526 status_attr, NULL);
1492 1527
1493 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1494 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1495 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (xdisp, fs);
1496 1531
1497 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1498 { 1533 {
1499 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1500 im_destroy (); 1535 im_destroy ();
1501 return false; 1536 return false;
1502 } 1537 }
1503 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1504 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1505 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1506 1547
1507 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1508 return true; 1548 return true;
1509} 1549}
1510 1550
1511void 1551void
1512rxvt_term::im_cb () 1552rxvt_term::im_cb ()
… …
1518 1558
1519 make_current (); 1559 make_current ();
1520 1560
1521 im_destroy (); 1561 im_destroy ();
1522 1562
1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1524 if (Input_Context) 1563 if (Input_Context)
1525 return; 1564 return;
1526 1565
1527#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1528 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])
… …
1601 XFree (preedit_attr); 1640 XFree (preedit_attr);
1602 XFree (status_attr); 1641 XFree (status_attr);
1603} 1642}
1604#endif /* USE_XIM */ 1643#endif /* USE_XIM */
1605 1644
1606/*----------------------------------------------------------------------*/
1607rxvt_t rxvt_current_term;
1608
1609/*----------------------- end-of-file (C source) -----------------------*/ 1645/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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