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

Diff Legend

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