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.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
56static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
57 57
58bool 58bool
59rxvt_set_locale (const char *locale) NOTHROW 59rxvt_set_locale (const char *locale) NOTHROW
60{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
61 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
66 return true; 71 return true;
67} 72}
68 73
69void 74void
… …
143} 148}
144#endif 149#endif
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
148#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
150#endif 156#endif
151#ifdef HAVE_SCROLLBARS 157#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 158 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
… …
169#ifdef POINTER_BLANK 175#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 176 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 177#endif
172#ifdef USE_XIM 178#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 179 im_ev (this, &rxvt_term::im_cb),
180#endif
181#ifndef NO_BELL
182 bell_ev (this, &rxvt_term::bell_cb),
174#endif 183#endif
175 termwin_ev (this, &rxvt_term::x_cb), 184 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 185 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb), 186 child_ev (this, &rxvt_term::child_cb),
178 check_ev (this, &rxvt_term::check_cb), 187 check_ev (this, &rxvt_term::check_cb),
… …
195void rxvt_term::emergency_cleanup () 204void rxvt_term::emergency_cleanup ()
196{ 205{
197 if (cmd_pid) 206 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 207 kill (-cmd_pid, SIGHUP);
199 208
209 pty_ev.stop ();
200 delete pty; pty = 0; 210 delete pty; pty = 0;
201} 211}
202 212
203rxvt_term::~rxvt_term () 213rxvt_term::~rxvt_term ()
204{ 214{
… …
213#endif 223#endif
214 delete fontset[0]; 224 delete fontset[0];
215 225
216 if (display) 226 if (display)
217 { 227 {
218 dDisp;
219
220 selection_clear (); 228 selection_clear ();
221 229
222#ifdef USE_XIM 230#ifdef USE_XIM
223 im_destroy (); 231 im_destroy ();
224#endif 232#endif
225#ifdef XTERM_SCROLLBAR 233#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 234 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 235 if (ShadowGC) XFreeGC (dpy, ShadowGC);
228#endif 236#endif
229#ifdef PLAIN_SCROLLBAR 237#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 238 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231#endif 239#endif
232#ifdef NEXT_SCROLLBAR 240#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 241 if (blackGC) XFreeGC (dpy, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 242 if (whiteGC) XFreeGC (dpy, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 243 if (grayGC) XFreeGC (dpy, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 244 if (darkGC) XFreeGC (dpy, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 245 if (stippleGC) XFreeGC (dpy, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 246 if (dimple) XFreePixmap (dpy, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 247 if (upArrow) XFreePixmap (dpy, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 248 if (downArrow) XFreePixmap (dpy, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 249 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 250 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243#endif 251#endif
244#ifdef RXVT_SCROLLBAR 252#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 253 if (topShadowGC) XFreeGC (dpy, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 254 if (botShadowGC) XFreeGC (dpy, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 255 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248#endif 256#endif
249 if (gc) XFreeGC (disp, gc); 257 if (gc) XFreeGC (dpy, gc);
250 258
251 delete drawable; 259 delete drawable;
252 // destroy all windows 260 // destroy all windows
253 if (parent[0]) 261 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 262 XDestroyWindow (dpy, parent[0]);
255 }
256 263
257 // TODO: free pixcolours, colours should become part of rxvt_display 264 for (int i = 0; i < TOTAL_COLORS; i++)
258 delete pix_colors_focused; 265 if (ISSET_PIXCOLOR (i))
266 {
267 pix_colors_focused [i].free (this);
259#if OFF_FOCUS_FADING 268#if OFF_FOCUS_FADING
269 pix_colors_unfocused [i].free (this);
270#endif
271 }
272
273 clear ();
274 }
275
276 delete [] pix_colors_focused;
277#if OFF_FOCUS_FADING
260 delete pix_colors_unfocused; 278 delete [] pix_colors_unfocused;
261#endif 279#endif
262 280
263 displays.put (display); 281 displays.put (display);
264 282
265 scr_release (); 283 scr_release ();
… …
268 for (int i = 0; i < allocated.size (); i++) 286 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 287 free (allocated [i]);
270 288
271 free (selection.text); 289 free (selection.text);
272 // TODO: manage env vars in child only(!) 290 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 291 free (env_display);
275 free (env_term); 292 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 293 free (locale);
278 free (v_buffer); 294 free (v_buffer);
279 free (incr_buf); 295 free (incr_buf);
280 296
281 delete envv; 297 delete envv;
… …
292{ 308{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 309 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294 310
295 cmd_pid = 0; 311 cmd_pid = 0;
296 312
297 if (!OPTION (Opt_hold)) 313 if (!option (Opt_hold))
298 destroy (); 314 destroy ();
299} 315}
300 316
301void 317void
302rxvt_term::destroy () 318rxvt_term::destroy ()
303{ 319{
304 if (destroy_ev.active) 320 if (destroy_ev.active)
305 return; 321 return;
306 322
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 323 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 324
310#if ENABLE_OVERLAY 325#if ENABLE_OVERLAY
311 scr_overlay_off (); 326 scr_overlay_off ();
312#endif 327#endif
313 328
… …
317 im_ev.stop (display); 332 im_ev.stop (display);
318#endif 333#endif
319#if HAVE_SCROLLBARS 334#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 335 scrollbar_ev.stop (display);
321#endif 336#endif
322#if TRANSPARENT 337#if TRANSPARENT || ENABLE_PERL
323 rootwin_ev.stop (display); 338 rootwin_ev.stop (display);
324#endif 339#endif
325 incr_ev.stop (); 340 incr_ev.stop ();
326 termwin_ev.stop (display); 341 termwin_ev.stop (display);
327 vt_ev.stop (display); 342 vt_ev.stop (display);
… …
368{ 383{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 384 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 385 (*t)->emergency_cleanup ();
371} 386}
372 387
373#if ENABLE_FRILLS 388#if !ENABLE_MINIMAL
374static void 389static void
375print_x_error (Display *dpy, XErrorEvent *event) 390print_x_error (Display *dpy, XErrorEvent *event)
376{ 391{
377 char buffer[BUFSIZ]; 392 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 393 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 441 GET_R->allowedxerror = event->error_code;
427 else 442 else
428 { 443 {
429 // GET_R is most likely not the terminal which caused the error, 444 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 445 // so just output the error and continue
431#if ENABLE_FRILLS 446#if ENABLE_MINIMAL
447 old_xerror_handler (display, event);
448#else
432 print_x_error (display, event); 449 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 450#endif
436 } 451 }
437 452
438 return 0; 453 return 0;
439} 454}
… …
447 _exit (EXIT_FAILURE); 462 _exit (EXIT_FAILURE);
448} 463}
449 464
450/*----------------------------------------------------------------------*/ 465/*----------------------------------------------------------------------*/
451bool 466bool
452rxvt_term::init (int argc, const char *const *argv) 467rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 468{
469 this->envv = envv;
470
454 SET_R (this); 471 SET_R (this);
455 set_locale (""); 472 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 473 set_environ (envv); // few things in X do not call setlocale :(
457 474
458 if (!init_vars ()) 475 if (!init_vars ())
… …
465#ifdef KEYSYM_RESOURCE 482#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 483 keyboard->register_done ();
467#endif 484#endif
468 485
469#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
470 if (OPTION (Opt_scrollBar)) 487 if (option (Opt_scrollBar))
471 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
472#endif 489#endif
473 490
474 pty = rxvt_new_ptytty (); 491 pty = ptytty::create ();
475 492
476 create_windows (argc, argv); 493 create_windows (argc, argv);
477 494
478 dDisp;
479
480 init_xlocale (); 495 init_xlocale ();
481 496
482 scr_reset (); // initialize screen 497 scr_reset (); // initialize screen
483 498
484#if 0 499#if 0
485 XSynchronize (disp, True); 500 XSynchronize (dpy, True);
486#endif 501#endif
487 502
488#ifdef HAVE_SCROLLBARS 503#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 504 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 505 resize_scrollbar (); /* create and map scrollbar */
491#endif 506#endif
492#ifdef TRANSPARENT 507#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent)) 508 if (option (Opt_transparent))
494 { 509 {
495 XSelectInput (disp, display->root, PropertyChangeMask); 510 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents (); 511 check_our_parents ();
497 rootwin_ev.start (display, display->root); 512 rootwin_ev.start (display, display->root);
498 } 513 }
499#endif 514#endif
515#if ENABLE_PERL
516 rootwin_ev.start (display, display->root);
517#endif
500 518
501 set_colorfgbg (); 519 set_colorfgbg ();
502 520
503 init_command (cmd_argv); 521 init_command (cmd_argv);
504 522
… …
509 527
510 check_ev.start (); 528 check_ev.start ();
511 529
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 530 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 531
532#if ENABLE_XEMBED
533 if (rs[Rs_embed])
534 {
535 long info[2] = { 0, XEMBED_MAPPED };
536
537 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
538 32, PropModeReplace, (unsigned char *)&info, 2);
539 }
540#endif
541
514 XMapWindow (disp, vt); 542 XMapWindow (dpy, vt);
515 XMapWindow (disp, parent[0]); 543 XMapWindow (dpy, parent[0]);
516 544
517 return true; 545 return true;
518} 546}
519 547
520static struct sig_handlers 548static struct sig_handlers
… …
525 * Catch a fatal signal and tidy up before quitting 553 * Catch a fatal signal and tidy up before quitting
526 */ 554 */
527 void 555 void
528 sig_term (sig_watcher &w) 556 sig_term (sig_watcher &w)
529 { 557 {
530#ifdef DEBUG_CMD
531 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
532#endif
533 rxvt_emergency_cleanup (); 558 rxvt_emergency_cleanup ();
534 signal (w.signum, SIG_DFL); 559 signal (w.signum, SIG_DFL);
535 kill (getpid (), w.signum); 560 kill (getpid (), w.signum);
536 } 561 }
537 562
… …
545char **rxvt_environ; // startup environment 570char **rxvt_environ; // startup environment
546 571
547void 572void
548rxvt_init () 573rxvt_init ()
549{ 574{
550 uid_t uid = getuid (); 575 ptytty::init ();
551 gid_t gid = getgid ();
552
553 // before doing anything else, check for setuid/setgid operation,
554 // start the helper process and drop privileges
555 if (uid != geteuid ()
556 || gid != getegid ())
557 {
558#if PTYTTY_HELPER
559 rxvt_ptytty_server ();
560#else
561 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
562#endif
563
564 // drop privileges
565#if HAVE_SETRESUID
566 setresgid (gid, gid, gid);
567 setresuid (uid, uid, uid);
568#elif HAVE_SETREUID
569 setregid (gid, gid);
570 setreuid (uid, uid);
571#elif HAVE_SETUID
572 setgid (gid);
573 setuid (uid);
574#endif
575
576 if (uid != geteuid ()
577 || gid != getegid ())
578 rxvt_fatal ("unable to drop privileges, aborting.\n");
579 }
580 576
581 rxvt_environ = environ; 577 rxvt_environ = environ;
582 578
583 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
584 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
… …
642{ 638{
643 short recalc_x, recalc_y; 639 short recalc_x, recalc_y;
644 int x, y, sb_w, flags; 640 int x, y, sb_w, flags;
645 unsigned int w, h; 641 unsigned int w, h;
646 unsigned int max_width, max_height; 642 unsigned int max_width, max_height;
647 dDisp;
648
649 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
650 ncol, nrow, szHint.width, szHint.height));
651 643
652 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 644 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
653 szHint.win_gravity = NorthWestGravity; 645 szHint.win_gravity = NorthWestGravity;
654 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 646 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
655 647
… …
717 709
718 if (scrollBar.state) 710 if (scrollBar.state)
719 { 711 {
720 sb_w = scrollbar_TotalWidth (); 712 sb_w = scrollbar_TotalWidth ();
721 szHint.base_width += sb_w; 713 szHint.base_width += sb_w;
714
722 if (!OPTION (Opt_scrollBar_right)) 715 if (!option (Opt_scrollBar_right))
723 window_vt_x += sb_w; 716 window_vt_x += sb_w;
724 } 717 }
725 718
726 szHint.width_inc = fwidth; 719 szHint.width_inc = fwidth;
727 szHint.height_inc = fheight; 720 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 721 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 722 szHint.min_height = szHint.base_height + szHint.height_inc;
730 723
731 if (newwidth && newwidth - szHint.base_width < max_width) 724 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 725 {
733 szHint.width = newwidth; 726 szHint.width = newwidth;
… …
748 { 741 {
749 min_it (height, max_height); 742 min_it (height, max_height);
750 szHint.height = szHint.base_height + height; 743 szHint.height = szHint.base_height + height;
751 } 744 }
752 745
753 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 746 if (scrollBar.state && option (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 747 window_sb_x = szHint.width - sb_w;
755 748
756 if (recalc_x) 749 if (recalc_x)
757 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
751
758 if (recalc_y) 752 if (recalc_y)
759 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
760 754
761 ncol = width / fwidth; 755 ncol = width / fwidth;
762 nrow = height / fheight; 756 nrow = height / fheight;
763 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
764 ncol, nrow, szHint.width,
765 szHint.height));
766 return;
767} 757}
768 758
769/*----------------------------------------------------------------------*/ 759/*----------------------------------------------------------------------*/
770/* 760/*
771 * Tell the teletype handler what size the window is. 761 * Tell the teletype handler what size the window is.
… …
823 delete fontset[0]; 813 delete fontset[0];
824 fontset[0] = fs; 814 fontset[0] = fs;
825 815
826 prop = (*fs)[1]->properties (); 816 prop = (*fs)[1]->properties ();
827 prop.height += lineSpace; 817 prop.height += lineSpace;
818
828 fs->set_prop (prop); 819 fs->set_prop (prop, false);
829 820
830 fwidth = prop.width; 821 fwidth = prop.width;
831 fheight = prop.height; 822 fheight = prop.height;
832 fbase = prop.ascent; 823 fbase = prop.ascent;
833 824
… …
842 { 833 {
843 fontset[style] = fs = new rxvt_fontset (this); 834 fontset[style] = fs = new rxvt_fontset (this);
844 rxvt_fontprop prop2 = prop; 835 rxvt_fontprop prop2 = prop;
845 836
846 if (res) 837 if (res)
847 prop2.weight = prop2.slant = rxvt_fontprop::unset; 838 {
839 fs->populate (res);
840 fs->set_prop (prop2, false);
841 }
848 else 842 else
849 { 843 {
850 res = fontset[0]->fontdesc; 844 fs->populate (fontset[0]->fontdesc);
851 845
852 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 846 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
853 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 847 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
848
849 fs->set_prop (prop2, true);
854 } 850 }
855 851
856 fs->populate (res);
857 fs->set_prop (prop2);
858 } 852 }
859#else 853#else
860 fontset[style] = fontset[0]; 854 fontset[style] = fontset[0];
861#endif 855#endif
862 } 856 }
… …
871 return true; 865 return true;
872} 866}
873 867
874void rxvt_term::set_string_property (Atom prop, const char *str, int len) 868void rxvt_term::set_string_property (Atom prop, const char *str, int len)
875{ 869{
876 XChangeProperty (display->display, parent[0], 870 XChangeProperty (dpy, parent[0],
877 prop, XA_STRING, 8, PropModeReplace, 871 prop, XA_STRING, 8, PropModeReplace,
878 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 872 (const unsigned char *)str, len >= 0 ? len : strlen (str));
879} 873}
880 874
881void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 875void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
882{ 876{
883 wchar_t *ws = rxvt_mbstowcs (str, len); 877 wchar_t *ws = rxvt_mbstowcs (str, len);
884 char *s = rxvt_wcstoutf8 (ws); 878 char *s = rxvt_wcstoutf8 (ws);
885 879
886 XChangeProperty (display->display, parent[0], 880 XChangeProperty (dpy, parent[0],
887 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 881 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
888 (const unsigned char *)s, strlen (s)); 882 (const unsigned char *)s, strlen (s));
889 883
890 free (s); 884 free (s);
891 free (ws); 885 free (ws);
… …
916void 910void
917rxvt_term::set_window_color (int idx, const char *color) 911rxvt_term::set_window_color (int idx, const char *color)
918{ 912{
919 rxvt_color xcol; 913 rxvt_color xcol;
920 int i; 914 int i;
921 915
922 if (color == NULL || *color == '\0') 916 if (color == NULL || *color == '\0')
923 return; 917 return;
918
919 color = strdup (color);
920 allocated.push_back ((void *)color);
921 rs[Rs_color + idx] = color;
924 922
925 /* handle color aliases */ 923 /* handle color aliases */
926 if (isdigit (*color)) 924 if (isdigit (*color))
927 { 925 {
928 i = atoi (color); 926 i = atoi (color);
929 927
930 if (i >= 8 && i <= 15) 928 if (i >= 8 && i <= 15)
931 { /* bright colors */ 929 { /* bright colors */
932 i -= 8; 930 i -= 8;
933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 931 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
934 SET_PIXCOLOR (idx);
935 goto done; 932 goto done;
936 } 933 }
937 934
938 if (i >= 0 && i <= 7) 935 if (i >= 0 && i <= 7)
939 { /* normal colors */ 936 { /* normal colors */
940 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
941 SET_PIXCOLOR (idx);
942 goto done; 938 goto done;
943 } 939 }
944 } 940 }
945 941
946 if (!rXParseAllocColor (&xcol, color)) 942 set_color (xcol, color);
947 return;
948
949 /* XStoreColor (display->display, display->cmap, XColor*); */
950 943
951 /* 944 /*
952 * FIXME: should free colors here, but no idea how to do it so instead, 945 * FIXME: should free colors here, but no idea how to do it so instead,
953 * so just keep gobbling up the colormap 946 * so just keep gobbling up the colormap
954 */ 947 */
955# if 0
956 for (i = Color_Black; i <= Color_White; i++)
957 if (pix_colors[idx] == pix_colors[i])
958 break;
959 if (i > Color_White)
960 {
961 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
962 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
963 DisplayPlanes (display->display, display->screen));
964 }
965# endif
966 948
967 pix_colors_focused[idx] = xcol; 949 pix_colors_focused[idx] = xcol;
968 SET_PIXCOLOR (idx);
969 950
970 /* XSetWindowAttributes attr; */ 951 /* XSetWindowAttributes attr; */
971 /* Cursor cursor; */ 952 /* Cursor cursor; */
972done: 953done:
973
974#if OFF_FOCUS_FADING
975 if (rs[Rs_fade])
976 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
977#endif
978
979 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
980 955
956 update_fade_color (idx);
981 recolour_cursor (); 957 recolour_cursor ();
982 scr_recolour (); 958 scr_recolour ();
983} 959}
984 960
985#else 961#else
… …
987#endif /* XTERM_COLOR_CHANGE */ 963#endif /* XTERM_COLOR_CHANGE */
988 964
989void 965void
990rxvt_term::recolour_cursor () 966rxvt_term::recolour_cursor ()
991{ 967{
992 XColor xcol[2]; 968 XColor fg, bg;
993 969
994 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 970 (ISSET_PIXCOLOR (Color_pointer_fg)
995 ? pix_colors_focused[Color_pointer_fg] 971 ? pix_colors_focused[Color_pointer_fg]
996 : pix_colors_focused[Color_fg]; 972 : pix_colors_focused[Color_fg]).get (fg);
973
997 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 974 (ISSET_PIXCOLOR (Color_pointer_bg)
998 ? pix_colors_focused[Color_pointer_bg] 975 ? pix_colors_focused[Color_pointer_bg]
999 : pix_colors_focused[Color_bg]; 976 : pix_colors_focused[Color_bg]).get (bg);
1000 977
1001 XQueryColors (display->display, display->cmap, xcol, 2); 978 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1002 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1003} 979}
1004 980
1005/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1006/* 982/*
1007 * find if fg/bg matches any of the normal (low-intensity) colors 983 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1011{ 987{
1012 unsigned int i; 988 unsigned int i;
1013 const char *xpmb = "\0"; 989 const char *xpmb = "\0";
1014 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1015 991
1016 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1017 strcpy (fstr, "default"); 992 strcpy (fstr, "default");
1018 strcpy (bstr, "default"); 993 strcpy (bstr, "default");
1019 for (i = Color_Black; i <= Color_White; i++) 994 for (i = Color_Black; i <= Color_White; i++)
1020 if (pix_colors[Color_fg] == pix_colors[i]) 995 if (pix_colors[Color_fg] == pix_colors[i])
1021 { 996 {
… …
1036 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1037} 1012}
1038 1013
1039/*----------------------------------------------------------------------*/ 1014/*----------------------------------------------------------------------*/
1040 1015
1041int 1016bool
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1017rxvt_term::set_color (rxvt_color &color, const char *name)
1043{ 1018{
1044 if (!screen_in_out->set (display, colour)) 1019 if (color.set (this, name))
1045 {
1046 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1047 return false;
1048 }
1049
1050 return true; 1020 return true;
1021
1022 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1023 return false;
1024}
1025
1026void
1027rxvt_term::alias_color (int dst, int src)
1028{
1029 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1051} 1030}
1052 1031
1053/* -------------------------------------------------------------------- * 1032/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 1033 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 1034 * -------------------------------------------------------------------- */
1056void 1035void
1057rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1036rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1058{ 1037{
1059 int fix_screen; 1038 int fix_screen;
1060 int old_width = szHint.width, old_height = szHint.height; 1039 int old_width = szHint.width;
1061 dDisp; 1040 int old_height = szHint.height;
1062 1041
1063 window_calc (newwidth, newheight); 1042 window_calc (newwidth, newheight);
1043
1044 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1064 XSetWMNormalHints (disp, parent[0], &szHint); 1045 XSetWMNormalHints (dpy, parent[0], &szHint);
1065 1046
1066 if (!ignoreparent) 1047 if (!ignoreparent)
1067 { 1048 {
1068#ifdef SMART_RESIZE 1049#ifdef SMART_RESIZE
1069 /* 1050 /*
… …
1073 int x, y, x1, y1; 1054 int x, y, x1, y1;
1074 int dx, dy; 1055 int dx, dy;
1075 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1056 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1076 Window unused_cr; 1057 Window unused_cr;
1077 1058
1078 XTranslateCoordinates (disp, parent[0], display->root, 1059 XTranslateCoordinates (dpy, parent[0], display->root,
1079 0, 0, &x, &y, &unused_cr); 1060 0, 0, &x, &y, &unused_cr);
1080 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1061 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1081 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1062 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1082 /* 1063 /*
1083 * if display->root isn't the parent window, a WM will probably have offset 1064 * if display->root isn't the parent window, a WM will probably have offset
1084 * our position for handles and decorations. Counter it 1065 * our position for handles and decorations. Counter it
1085 */ 1066 */
… …
1087 { 1068 {
1088 x -= x1; 1069 x -= x1;
1089 y -= y1; 1070 y -= y1;
1090 } 1071 }
1091 1072
1092 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1073 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1093 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1074 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1094 dx = old_width - szHint.width; 1075 dx = old_width - szHint.width;
1095 dy = old_height - szHint.height; 1076 dy = old_height - szHint.height;
1096 1077
1097 /* Check position of the center of the window */ 1078 /* Check position of the center of the window */
1098 if (x < x1) /* left half */ 1079 if (x < x1) /* left half */
1099 dx = 0; 1080 dx = 0;
… …
1102 if (y < y1) /* top half */ 1083 if (y < y1) /* top half */
1103 dy = 0; 1084 dy = 0;
1104 else if (y == y1) /* exact center */ 1085 else if (y == y1) /* exact center */
1105 dy /= 2; 1086 dy /= 2;
1106 1087
1107 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1088 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1108 szHint.width, szHint.height); 1089 szHint.width, szHint.height);
1109#else 1090#else
1110 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1091 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1111#endif 1092#endif
1112 } 1093 }
1113 1094
1114 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1095 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1115 1096
1116 if (fix_screen || newwidth != old_width || newheight != old_height) 1097 if (fix_screen || newwidth != old_width || newheight != old_height)
1117 { 1098 {
1118 if (scrollBar.state) 1099 if (scrollBar.state)
1119 { 1100 {
1120 XMoveResizeWindow (disp, scrollBar.win, 1101 XMoveResizeWindow (dpy, scrollBar.win,
1121 window_sb_x, 0, 1102 window_sb_x, 0,
1122 scrollbar_TotalWidth (), szHint.height); 1103 scrollbar_TotalWidth (), szHint.height);
1123 resize_scrollbar (); 1104 resize_scrollbar ();
1124 } 1105 }
1125 1106
1126 XMoveResizeWindow (disp, vt, 1107 XMoveResizeWindow (dpy, vt,
1127 window_vt_x, window_vt_y, 1108 window_vt_x, window_vt_y,
1128 width, height); 1109 width, height);
1129 1110
1130 scr_clear (); 1111 scr_clear ();
1131#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1132 resize_pixmap (); 1113 resize_pixmap ();
1133#endif 1114#endif
1134 } 1115 }
1135 1116
1136 if (fix_screen || old_height == 0) 1117 if (fix_screen || old_height == 0)
1137 {
1138 int curr_screen = -1;
1139 int old_ncol = prev_ncol;
1140
1141 /* scr_reset only works on the primary screen */
1142 if (old_height) /* this is not the first time through */
1143 {
1144 unsigned int ocol = ncol;
1145 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1146 curr_screen = scr_change_screen (PRIMARY);
1147 ncol = ocol;
1148 }
1149
1150 scr_reset (); 1118 scr_reset ();
1151 1119
1152 if (curr_screen >= 0) /* this is not the first time through */ 1120 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1153 { 1121 //scr_touch (false);
1154 scr_change_screen (curr_screen);
1155 selection_check (old_ncol != ncol ? 4 : 0);
1156 }
1157 }
1158
1159 old_width = szHint.width;
1160 old_height = szHint.height;
1161 1122
1162#ifdef XPM_BACKGROUND 1123#ifdef XPM_BACKGROUND
1163 if (pixmap) 1124 if (pixmap)
1164 scr_touch (false); 1125 scr_touch (false);
1165#endif 1126#endif
1166 1127
1167#ifdef USE_XIM 1128#ifdef USE_XIM
1168 IMSetStatusPosition (); 1129 IMSetPosition ();
1169#endif 1130#endif
1170} 1131}
1171 1132
1172/* 1133/*
1173 * Set the width/height of the vt window in characters. Units are pixels. 1134 * Set the width/height of the vt window in characters. Units are pixels.
… …
1178{ 1139{
1179 XWindowAttributes wattr; 1140 XWindowAttributes wattr;
1180 1141
1181 if (newwidth == 0 || newheight == 0) 1142 if (newwidth == 0 || newheight == 0)
1182 { 1143 {
1183 XGetWindowAttributes (display->display, display->root, &wattr); 1144 XGetWindowAttributes (dpy, display->root, &wattr);
1184 1145
1185 if (newwidth == 0) 1146 if (newwidth == 0)
1186 newwidth = wattr.width - szHint.base_width; 1147 newwidth = wattr.width - szHint.base_width;
1187 if (newheight == 0) 1148 if (newheight == 0)
1188 newheight = wattr.height - szHint.base_height; 1149 newheight = wattr.height - szHint.base_height;
… …
1202#ifdef USE_XIM 1163#ifdef USE_XIM
1203 1164
1204void 1165void
1205rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1166rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1206{ 1167{
1207 fg = pix_colors[Color_fg]; 1168 fg = pix_colors [Color_fg];
1208 bg = pix_colors[Color_bg]; 1169 bg = pix_colors [Color_bg];
1209} 1170}
1210 1171
1211void 1172void
1212rxvt_term::im_set_size (XRectangle &size) 1173rxvt_term::im_set_size (XRectangle &size)
1213{ 1174{
… …
1250 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1211 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1251 1212
1252 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1213 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1253 *p = '\0'; 1214 *p = '\0';
1254 1215
1255 atom = XInternAtom (display->display, server, False); 1216 atom = XInternAtom (dpy, server, False);
1256 win = XGetSelectionOwner (display->display, atom); 1217 win = XGetSelectionOwner (dpy, atom);
1257 1218
1258 if (win != None) 1219 if (win != None)
1259 return True; 1220 return True;
1260 } 1221 }
1261 1222
… …
1268 XPoint nspot; 1229 XPoint nspot;
1269 XVaNestedList preedit_attr; 1230 XVaNestedList preedit_attr;
1270 1231
1271 if (!Input_Context 1232 if (!Input_Context
1272 || !focus 1233 || !focus
1273 || !(input_style & XIMPreeditPosition)) 1234 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1274 return; 1235 return;
1275 1236
1276 im_set_position (nspot); 1237 im_set_position (nspot);
1277 1238
1278 if (nspot.x == spot.x && nspot.y == spot.y) 1239 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1297 input_method = 0; 1258 input_method = 0;
1298 } 1259 }
1299 1260
1300 Input_Context = 0; 1261 Input_Context = 0;
1301} 1262}
1263
1264#ifdef ENABLE_XIM_ONTHESPOT
1265
1266static void
1267xim_preedit_start (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_START, DT_END));
1271}
1272
1273static void
1274xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1275{
1276 ((rxvt_term *)client_data)->make_current ();
1277 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1278}
1279
1280static void
1281xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1282{
1283 rxvt_term *term = (rxvt_term *)client_data;
1284 XIMText *text = call_data->text;
1285
1286 term->make_current ();
1287
1288 if (text)
1289 {
1290 void *str;
1291
1292 if (!text->encoding_is_wchar && text->string.multi_byte)
1293 {
1294 // of course, X makes it ugly again
1295 if (term->rs[Rs_imLocale])
1296 SET_LOCALE (term->rs[Rs_imLocale]);
1297
1298 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1299 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1300
1301 if (term->rs[Rs_imLocale])
1302 SET_LOCALE (term->locale);
1303 }
1304 else
1305 str = (void *)text->string.wide_char;
1306
1307 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1308 DT_INT, call_data->caret,
1309 DT_INT, call_data->chg_first,
1310 DT_INT, call_data->chg_length,
1311 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1312 DT_WCS_LEN, str, str ? (int)text->length : 0,
1313 DT_END));
1314 }
1315 else
1316 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1317 DT_INT, call_data->caret,
1318 DT_INT, call_data->chg_first,
1319 DT_INT, call_data->chg_length,
1320 DT_END));
1321}
1322
1323#if 0
1324static void
1325xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1326{
1327 ((rxvt_term *)client_data)->make_current ();
1328 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1329 DT_INT, call_data->position,
1330 DT_INT, call_data->direction,
1331 DT_INT, call_data->style,
1332 DT_END));
1333}
1334#endif
1335
1336#endif
1302 1337
1303/* 1338/*
1304 * Try to open a XIM with the current modifiers, then see if we can 1339 * Try to open a XIM with the current modifiers, then see if we can
1305 * open a suitable preedit type 1340 * open a suitable preedit type
1306 */ 1341 */
… …
1313 XRectangle rect, status_rect, needed_rect; 1348 XRectangle rect, status_rect, needed_rect;
1314 unsigned long fg, bg; 1349 unsigned long fg, bg;
1315 const char *p; 1350 const char *p;
1316 char **s; 1351 char **s;
1317 XIMStyles *xim_styles; 1352 XIMStyles *xim_styles;
1353#ifdef ENABLE_XIM_ONTHESPOT
1354 XIMCallback xcb[4];
1355#endif
1318 1356
1319 set_environ (envv); 1357 set_environ (envv);
1320 1358
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1359 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1360 return false;
1323 1361
1324 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1325 input_method = display->get_xim (locale, modifiers); 1362 input_method = display->get_xim (locale, modifiers);
1326 if (input_method == NULL) 1363 if (input_method == NULL)
1327 return false; 1364 return false;
1328 1365
1329 xim = input_method->xim; 1366 xim = input_method->xim;
… …
1349 s = rxvt_splitcommastring (p); 1386 s = rxvt_splitcommastring (p);
1350 1387
1351 for (i = found = 0; !found && s[i]; i++) 1388 for (i = found = 0; !found && s[i]; i++)
1352 { 1389 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1390 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = (XIMPreeditPosition | XIMStatusNothing); 1391 input_style = XIMPreeditPosition | XIMStatusNothing;
1355 else if (!strcmp (s[i], "OffTheSpot")) 1392 else if (!strcmp (s[i], "OffTheSpot"))
1356 input_style = (XIMPreeditArea | XIMStatusArea); 1393 input_style = XIMPreeditArea | XIMStatusArea;
1357 else if (!strcmp (s[i], "Root")) 1394 else if (!strcmp (s[i], "Root"))
1358 input_style = (XIMPreeditNothing | XIMStatusNothing); 1395 input_style = XIMPreeditNothing | XIMStatusNothing;
1359 else if (!strcmp (s[i], "None")) 1396 else if (!strcmp (s[i], "None"))
1360 input_style = (XIMPreeditNone | XIMStatusNone); 1397 input_style = XIMPreeditNone | XIMStatusNone;
1398#ifdef ENABLE_XIM_ONTHESPOT
1399 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1400 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1401#endif
1402 else
1403 input_style = XIMPreeditNothing | XIMStatusNothing;
1361 1404
1362 for (j = 0; j < xim_styles->count_styles; j++) 1405 for (j = 0; j < xim_styles->count_styles; j++)
1363 if (input_style == xim_styles->supported_styles[j]) 1406 if (input_style == xim_styles->supported_styles[j])
1364 { 1407 {
1365 rxvt_freecommastring (s); 1408 rxvt_freecommastring (s);
… …
1403 "*", 1446 "*",
1404 fheight, 1447 fheight,
1405 fheight + 1, fheight - 1, 1448 fheight + 1, fheight - 1,
1406 fheight - 2, fheight + 2); 1449 fheight - 2, fheight + 2);
1407 1450
1408 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1451 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1409 &missing_charset_list, &missing_charset_count, &def_string); 1452 &missing_charset_list, &missing_charset_count, &def_string);
1410 1453
1411 if (missing_charset_list) 1454 if (missing_charset_list)
1412 XFreeStringList (missing_charset_list); 1455 XFreeStringList (missing_charset_list);
1413 1456
… …
1454 XNBackground, bg, 1497 XNBackground, bg,
1455 XNArea, &status_rect, 1498 XNArea, &status_rect,
1456 XNFontSet, fs, 1499 XNFontSet, fs,
1457 NULL); 1500 NULL);
1458 } 1501 }
1502#if ENABLE_XIM_ONTHESPOT
1503 else if (input_style & XIMPreeditCallbacks)
1504 {
1505 im_set_position (spot);
1506
1507 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1508 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1509 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1510# if 0
1511 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1512# endif
1513
1514 preedit_attr = XVaCreateNestedList (0,
1515 XNSpotLocation, &spot,
1516 XNPreeditStartCallback, &xcb[0],
1517 XNPreeditDoneCallback , &xcb[1],
1518 XNPreeditDrawCallback , &xcb[2],
1519# if 0
1520 XNPreeditCaretCallback, &xcb[3],
1521# endif
1522 NULL);
1523 }
1524#endif
1459 1525
1460 Input_Context = XCreateIC (xim, 1526 Input_Context = XCreateIC (xim,
1461 XNInputStyle, input_style, 1527 XNInputStyle, input_style,
1462 XNClientWindow, vt, 1528 XNClientWindow, vt,
1463 XNFocusWindow, parent[0], 1529 XNFocusWindow, parent[0],
… …
1465 preedit_attr, 1531 preedit_attr,
1466 status_attr ? XNStatusAttributes : NULL, 1532 status_attr ? XNStatusAttributes : NULL,
1467 status_attr, NULL); 1533 status_attr, NULL);
1468 1534
1469 if (preedit_attr) XFree (preedit_attr); 1535 if (preedit_attr) XFree (preedit_attr);
1470 if (status_attr) XFree (status_attr); 1536 if (status_attr) XFree (status_attr);
1471 if (fs) XFreeFontSet (display->display, fs); 1537 if (fs) XFreeFontSet (dpy, fs);
1472 1538
1473 if (Input_Context == NULL) 1539 if (Input_Context == NULL)
1474 { 1540 {
1475 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1541 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1476 im_destroy (); 1542 im_destroy ();
1477 return false; 1543 return false;
1478 } 1544 }
1479 1545
1480 if (input_style & XIMPreeditArea) 1546#if 0
1547 // unfortunately, only the focus window is used by XIM, hard to fix
1548 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1549 vt_select_input ();
1550#endif
1551
1481 IMSetStatusPosition (); 1552 IMSetPosition ();
1482 1553
1483 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1484 return true; 1554 return true;
1485} 1555}
1486 1556
1487void 1557void
1488rxvt_term::im_cb () 1558rxvt_term::im_cb ()
… …
1494 1564
1495 make_current (); 1565 make_current ();
1496 1566
1497 im_destroy (); 1567 im_destroy ();
1498 1568
1499 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1500 if (Input_Context) 1569 if (Input_Context)
1501 return; 1570 return;
1502 1571
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
… …
1546 SET_LOCALE (locale); 1615 SET_LOCALE (locale);
1547#endif 1616#endif
1548} 1617}
1549 1618
1550void 1619void
1551rxvt_term::IMSetStatusPosition () 1620rxvt_term::IMSetPosition ()
1552{ 1621{
1553 XRectangle preedit_rect, status_rect, *needed_rect; 1622 XRectangle preedit_rect, status_rect, *needed_rect;
1554 XVaNestedList preedit_attr, status_attr; 1623 XVaNestedList preedit_attr, status_attr;
1555 1624
1556 if (!Input_Context 1625 if (!Input_Context
1557 || !focus 1626 || !focus
1558 || !(input_style & XIMPreeditArea) 1627 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1559 || !IMisRunning ()) 1628 || !IMisRunning ())
1560 return; 1629 return;
1561 1630
1631 if (input_style & XIMPreeditPosition)
1632 {
1633 im_set_size (preedit_rect);
1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635
1636 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, NULL);
1638 }
1639 else
1640 {
1562 /* Getting the necessary width of preedit area */ 1641 /* Getting the necessary width of preedit area */
1563 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1642 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1643 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565 XFree (status_attr); 1644 XFree (status_attr);
1566 1645
1567 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1646 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1568 XFree (needed_rect); 1647 XFree (needed_rect);
1569 1648
1570 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1649 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1571 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1650 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1572 1651
1573 XSetICValues (Input_Context, 1652 XSetICValues (Input_Context,
1574 XNPreeditAttributes, preedit_attr, 1653 XNPreeditAttributes, preedit_attr,
1575 XNStatusAttributes, status_attr, NULL); 1654 XNStatusAttributes, status_attr,
1655 NULL);
1576 1656
1657 XFree (status_attr);
1658 }
1659
1577 XFree (preedit_attr); 1660 XFree (preedit_attr);
1578 XFree (status_attr);
1579} 1661}
1580#endif /* USE_XIM */ 1662#endif /* USE_XIM */
1581 1663
1582/*----------------------- end-of-file (C source) -----------------------*/ 1664/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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