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.223 by root, Sat Feb 18 14:14:43 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
194void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
195{ 199{
196 if (cmd_pid) 200 if (cmd_pid)
197 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
198 202
203 pty_ev.stop ();
199 delete pty; pty = 0; 204 delete pty; pty = 0;
200} 205}
201 206
202rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
203{ 208{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 209 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 210
208 emergency_cleanup (); 211 emergency_cleanup ();
209 212
210#if ENABLE_STYLES 213#if ENABLE_STYLES
… …
214#endif 217#endif
215 delete fontset[0]; 218 delete fontset[0];
216 219
217 if (display) 220 if (display)
218 { 221 {
219 dDisp;
220
221 selection_clear (); 222 selection_clear ();
222 223
223#ifdef USE_XIM 224#ifdef USE_XIM
224 im_destroy (); 225 im_destroy ();
225#endif 226#endif
226#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 230#endif
230#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 233#endif
233#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 245#endif
245#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 250#endif
250 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
251 252
252 delete drawable; 253 delete drawable;
253 // destroy all windows 254 // destroy all windows
254 if (parent[0]) 255 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
256 }
257 257
258 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
266
267 clear ();
268 }
269
259 delete pix_colors_focused; 270 delete pix_colors_focused;
260#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
261 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
262#endif 273#endif
263 274
… …
269 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 281 free (allocated [i]);
271 282
272 free (selection.text); 283 free (selection.text);
273 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 285 free (env_display);
276 free (env_term); 286 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 287 free (locale);
279 free (v_buffer); 288 free (v_buffer);
280 free (incr_buf); 289 free (incr_buf);
281 290
282 delete envv; 291 delete envv;
… …
285#ifdef KEYSYM_RESOURCE 294#ifdef KEYSYM_RESOURCE
286 delete keyboard; 295 delete keyboard;
287#endif 296#endif
288} 297}
289 298
299// child has exited, usually destroys
290void 300void
291rxvt_term::child_exit () 301rxvt_term::child_cb (child_watcher &w, int status)
292{ 302{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304
293 cmd_pid = 0; 305 cmd_pid = 0;
294 306
295 if (!OPTION (Opt_hold)) 307 if (!OPTION (Opt_hold))
296 destroy (); 308 destroy ();
297} 309}
… …
299void 311void
300rxvt_term::destroy () 312rxvt_term::destroy ()
301{ 313{
302 if (destroy_ev.active) 314 if (destroy_ev.active)
303 return; 315 return;
316
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
304 318
305#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
306 scr_overlay_off (); 320 scr_overlay_off ();
307#endif 321#endif
308 322
… …
363{ 377{
364 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
366} 380}
367 381
368#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
369static void 383static void
370print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
371{ 385{
372 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
373 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
421 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
422 else 436 else
423 { 437 {
424 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
425 // so just output the error and continue 439 // so just output the error and continue
426#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
427 print_x_error (display, event); 443 print_x_error (display, event);
428#else
429 old_xerror_handler (display, event);
430#endif 444#endif
431 } 445 }
432 446
433 return 0; 447 return 0;
434} 448}
… …
442 _exit (EXIT_FAILURE); 456 _exit (EXIT_FAILURE);
443} 457}
444 458
445/*----------------------------------------------------------------------*/ 459/*----------------------------------------------------------------------*/
446bool 460bool
447rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 462{
463 this->envv = envv;
464
449 SET_R (this); 465 SET_R (this);
450 set_locale (""); 466 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 467 set_environ (envv); // few things in X do not call setlocale :(
452 468
453 if (!init_vars ()) 469 if (!init_vars ())
… …
464#ifdef HAVE_SCROLLBARS 480#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 481 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 483#endif
468 484
469#if ENABLE_PERL 485 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 486
484 create_windows (argc, argv); 487 create_windows (argc, argv);
485 488
486 dDisp;
487
488 init_xlocale (); 489 init_xlocale ();
489 490
490 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
491 492
492#if 0 493#if 0
493 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
494#endif 495#endif
495 496
496#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
499#endif 500#endif
500#ifdef TRANSPARENT 501#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
502 { 503 {
503 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 505 check_our_parents ();
505 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
506 } 507 }
507#endif 508#endif
508 509
509 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]);
511
512 set_colorfgbg (); 510 set_colorfgbg ();
513 511
514 init_command (cmd_argv); 512 init_command (cmd_argv);
515 513
516 free (cmd_argv); 514 free (cmd_argv);
… …
520 518
521 check_ev.start (); 519 check_ev.start ();
522 520
523 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
524 522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
533 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]);
535
525 return true; 536 return true;
526} 537}
527 538
528static struct sig_handlers 539static struct sig_handlers
529{ 540{
530 sig_watcher sw_chld, sw_term, sw_int; 541 sig_watcher sw_term, sw_int;
531 542
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 /* 543 /*
547 * Catch a fatal signal and tidy up before quitting 544 * Catch a fatal signal and tidy up before quitting
548 */ 545 */
549 void 546 void
550 sig_term (sig_watcher &w) 547 sig_term (sig_watcher &w)
551 { 548 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 549 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 550 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 551 kill (getpid (), w.signum);
558 } 552 }
559 553
560 sig_handlers () 554 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 555 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 556 sw_int (this, &sig_handlers::sig_term)
564 { 557 {
565 } 558 }
566} sig_handlers; 559} sig_handlers;
567 560
568char **rxvt_environ; // startup environment 561char **rxvt_environ; // startup environment
569 562
570void 563void
571rxvt_init () 564rxvt_init ()
572{ 565{
573 uid_t uid = getuid (); 566 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 567
604 rxvt_environ = environ; 568 rxvt_environ = environ;
605 569
606 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
607 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
608 572
609 sig_handlers.sw_chld.start (SIGCHLD);
610 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM);
611 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT);
612 575
613 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
614 /* signal (SIGURG, SIG_DFL); */ 577 /* signal (SIGURG, SIG_DFL); */
… …
643 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
644 607
645 return p; 608 return p;
646} 609}
647 610
648void * 611void *
649rxvt_realloc (void *ptr, size_t size) 612rxvt_realloc (void *ptr, size_t size)
650{ 613{
651 void *p = realloc (ptr, size); 614 void *p = realloc (ptr, size);
652 615
653 if (!p) 616 if (!p)
… …
666{ 629{
667 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
668 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
669 unsigned int w, h; 632 unsigned int w, h;
670 unsigned int max_width, max_height; 633 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 634
676 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
677 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
678 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
679 638
… …
741 700
742 if (scrollBar.state) 701 if (scrollBar.state)
743 { 702 {
744 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
745 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
746 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
747 window_vt_x += sb_w; 707 window_vt_x += sb_w;
748 } 708 }
749 709
750 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
751 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
752 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
753 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
754 714
755 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
756 { 716 {
757 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
776 736
777 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
778 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
779 739
780 if (recalc_x) 740 if (recalc_x)
781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
782 if (recalc_y) 743 if (recalc_y)
783 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
784 745
785 ncol = width / fwidth; 746 ncol = width / fwidth;
786 nrow = height / fheight; 747 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} 748}
792 749
793/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
794/* 751/*
795 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
… …
895 return true; 852 return true;
896} 853}
897 854
898void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
899{ 856{
900 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
901 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
902 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
903} 860}
904 861
905void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
906{ 863{
907 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
908 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
909 866
910 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
911 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
912 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
913 870
914 free (s); 871 free (s);
915 free (ws); 872 free (ws);
… …
940void 897void
941rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
942{ 899{
943 rxvt_color xcol; 900 rxvt_color xcol;
944 int i; 901 int i;
945 902
946 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
947 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
948 909
949 /* handle color aliases */ 910 /* handle color aliases */
950 if (isdigit (*color)) 911 if (isdigit (*color))
951 { 912 {
952 i = atoi (color); 913 i = atoi (color);
953 914
954 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
955 { /* bright colors */ 916 { /* bright colors */
956 i -= 8; 917 i -= 8;
957 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
958 SET_PIXCOLOR (idx);
959 goto done; 919 goto done;
960 } 920 }
961 921
962 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
963 { /* normal colors */ 923 { /* normal colors */
964 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
965 SET_PIXCOLOR (idx);
966 goto done; 925 goto done;
967 } 926 }
968 } 927 }
969 928
970 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
971 return;
972
973 /* XStoreColor (display->display, display->cmap, XColor*); */
974 930
975 /* 931 /*
976 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
977 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
978 */ 934 */
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 935
991 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
992 SET_PIXCOLOR (idx);
993 937
994 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
995 /* Cursor cursor; */ 939 /* Cursor cursor; */
996done: 940done:
997 941
998#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
999 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
1000 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
1001#endif 949#endif
1002 950
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 952
1005 recolour_cursor (); 953 recolour_cursor ();
… …
1011#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1012 960
1013void 961void
1014rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1015{ 963{
1016 XColor xcol[2]; 964 XColor fg, bg;
1017 965
1018 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1019 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1020 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1021 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1022 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1023 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1024 973
1025 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1026 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1027} 975}
1028 976
1029/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1030/* 978/*
1031 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1035{ 983{
1036 unsigned int i; 984 unsigned int i;
1037 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1039 987
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1041 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1042 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1045 { 992 {
… …
1060 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1061} 1008}
1062 1009
1063/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1064 1011
1065int 1012bool
1066rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1067{ 1014{
1068 if (!screen_in_out->set (display, colour)) 1015 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; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1075} 1026}
1076 1027
1077/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1078 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1079 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1080void 1031void
1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1082{ 1033{
1083 int fix_screen; 1034 int fix_screen;
1084 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1085 dDisp; 1036 int old_height = szHint.height;
1086 1037
1087 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1088 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1089 1042
1090 if (!ignoreparent) 1043 if (!ignoreparent)
1091 { 1044 {
1092#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1093 /* 1046 /*
… …
1097 int x, y, x1, y1; 1050 int x, y, x1, y1;
1098 int dx, dy; 1051 int dx, dy;
1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100 Window unused_cr; 1053 Window unused_cr;
1101 1054
1102 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1103 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1104 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106 /* 1059 /*
1107 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1108 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1109 */ 1062 */
… …
1111 { 1064 {
1112 x -= x1; 1065 x -= x1;
1113 y -= y1; 1066 y -= y1;
1114 } 1067 }
1115 1068
1116 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1117 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1118 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1119 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1120 1073
1121 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1122 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1123 dx = 0; 1076 dx = 0;
… …
1126 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1127 dy = 0; 1080 dy = 0;
1128 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1129 dy /= 2; 1082 dy /= 2;
1130 1083
1131 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1132 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1133#else 1086#else
1134 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1135#endif 1088#endif
1136 } 1089 }
1137 1090
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 1092
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 1094 {
1142 if (scrollBar.state) 1095 if (scrollBar.state)
1143 { 1096 {
1144 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1145 window_sb_x, 0, 1098 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar (); 1100 resize_scrollbar ();
1148 } 1101 }
1149 1102
1150 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1152 width, height); 1105 width, height);
1153 1106
1154 scr_clear (); 1107 scr_clear ();
1155#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1156 resize_pixmap (); 1109 resize_pixmap ();
1157#endif 1110#endif
1158 } 1111 }
1159 1112
1160 if (fix_screen || old_height == 0) 1113 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 (); 1114 scr_reset ();
1175 1115
1176 if (curr_screen >= 0) /* this is not the first time through */ 1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1177 { 1117 //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 1118
1186#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1187 if (pixmap) 1120 if (pixmap)
1188 scr_touch (false); 1121 scr_touch (false);
1189#endif 1122#endif
1190 1123
1191#ifdef USE_XIM 1124#ifdef USE_XIM
1192 IMSetStatusPosition (); 1125 IMSetPosition ();
1193#endif 1126#endif
1194} 1127}
1195 1128
1196/* 1129/*
1197 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1202{ 1135{
1203 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1204 1137
1205 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1206 { 1139 {
1207 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1208 1141
1209 if (newwidth == 0) 1142 if (newwidth == 0)
1210 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1211 if (newheight == 0) 1144 if (newheight == 0)
1212 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1226#ifdef USE_XIM 1159#ifdef USE_XIM
1227 1160
1228void 1161void
1229rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1230{ 1163{
1231 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1232 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1233} 1166}
1234 1167
1235void 1168void
1236rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1237{ 1170{
… …
1274 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1275 1208
1276 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1277 *p = '\0'; 1210 *p = '\0';
1278 1211
1279 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1280 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1281 1214
1282 if (win != None) 1215 if (win != None)
1283 return True; 1216 return True;
1284 } 1217 }
1285 1218
… …
1292 XPoint nspot; 1225 XPoint nspot;
1293 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1294 1227
1295 if (!Input_Context 1228 if (!Input_Context
1296 || !focus 1229 || !focus
1297 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1298 return; 1231 return;
1299 1232
1300 im_set_position (nspot); 1233 im_set_position (nspot);
1301 1234
1302 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1321 input_method = 0; 1254 input_method = 0;
1322 } 1255 }
1323 1256
1324 Input_Context = 0; 1257 Input_Context = 0;
1325} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1326 1333
1327/* 1334/*
1328 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1329 * open a suitable preedit type 1336 * open a suitable preedit type
1330 */ 1337 */
… …
1337 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1338 unsigned long fg, bg; 1345 unsigned long fg, bg;
1339 const char *p; 1346 const char *p;
1340 char **s; 1347 char **s;
1341 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1342 1352
1343 set_environ (envv); 1353 set_environ (envv);
1344 1354
1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1346 return false; 1356 return false;
1347 1357
1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1349 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1350 if (input_method == NULL) 1359 if (input_method == NULL)
1351 return false; 1360 return false;
1352 1361
1353 xim = input_method->xim; 1362 xim = input_method->xim;
… …
1373 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1374 1383
1375 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1376 { 1385 {
1377 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1378 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1379 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1380 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1381 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1382 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1383 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1384 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1385 1400
1386 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1387 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1388 { 1403 {
1389 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1427 "*", 1442 "*",
1428 fheight, 1443 fheight,
1429 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1430 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1431 1446
1432 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1433 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1434 1449
1435 if (missing_charset_list) 1450 if (missing_charset_list)
1436 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1437 1452
… …
1478 XNBackground, bg, 1493 XNBackground, bg,
1479 XNArea, &status_rect, 1494 XNArea, &status_rect,
1480 XNFontSet, fs, 1495 XNFontSet, fs,
1481 NULL); 1496 NULL);
1482 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1483 1521
1484 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1485 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1486 XNClientWindow, vt, 1524 XNClientWindow, vt,
1487 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1489 preedit_attr, 1527 preedit_attr,
1490 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1491 status_attr, NULL); 1529 status_attr, NULL);
1492 1530
1493 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1494 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1495 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1496 1534
1497 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1498 { 1536 {
1499 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1500 im_destroy (); 1538 im_destroy ();
1501 return false; 1539 return false;
1502 } 1540 }
1503 1541
1504 if (input_style & XIMPreeditArea) 1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1545 vt_select_input ();
1546#endif
1547
1505 IMSetStatusPosition (); 1548 IMSetPosition ();
1506 1549
1507 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1508 return true; 1550 return true;
1509} 1551}
1510 1552
1511void 1553void
1512rxvt_term::im_cb () 1554rxvt_term::im_cb ()
… …
1518 1560
1519 make_current (); 1561 make_current ();
1520 1562
1521 im_destroy (); 1563 im_destroy ();
1522 1564
1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1524 if (Input_Context) 1565 if (Input_Context)
1525 return; 1566 return;
1526 1567
1527#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1528 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1570 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1571#endif 1612#endif
1572} 1613}
1573 1614
1574void 1615void
1575rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1576{ 1617{
1577 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1578 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1579 1620
1580 if (!Input_Context 1621 if (!Input_Context
1581 || !focus 1622 || !focus
1582 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1583 || !IMisRunning ()) 1624 || !IMisRunning ())
1584 return; 1625 return;
1585 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1586 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1587 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1588 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1589 XFree (status_attr); 1640 XFree (status_attr);
1590 1641
1591 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1592 XFree (needed_rect); 1643 XFree (needed_rect);
1593 1644
1594 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1595 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1596 1647
1597 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1598 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1599 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1600 1652
1653 XFree (status_attr);
1654 }
1655
1601 XFree (preedit_attr); 1656 XFree (preedit_attr);
1602 XFree (status_attr);
1603} 1657}
1604#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1605 1659
1606/*----------------------------------------------------------------------*/
1607rxvt_t rxvt_current_term;
1608
1609/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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