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.240 by sasha, Fri Aug 10 22:10:36 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
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
492#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
494 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
495 XSelectInput (disp, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
498 } 531 }
532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render_background ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
499#endif 560#endif
500 561
501 set_colorfgbg (); 562 set_colorfgbg ();
502 563
503 init_command (cmd_argv); 564 init_command (cmd_argv);
… …
509 570
510 check_ev.start (); 571 check_ev.start ();
511 572
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 573 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
514 XMapWindow (disp, vt); 585 XMapWindow (dpy, vt);
515 XMapWindow (disp, parent[0]); 586 XMapWindow (dpy, parent[0]);
516 587
517 return true; 588 return true;
518} 589}
519 590
520static struct sig_handlers 591static struct sig_handlers
… …
525 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
526 */ 597 */
527 void 598 void
528 sig_term (sig_watcher &w) 599 sig_term (sig_watcher &w)
529 { 600 {
530#ifdef DEBUG_CMD
531 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
532#endif
533 rxvt_emergency_cleanup (); 601 rxvt_emergency_cleanup ();
534 signal (w.signum, SIG_DFL); 602 signal (w.signum, SIG_DFL);
535 kill (getpid (), w.signum); 603 kill (getpid (), w.signum);
536 } 604 }
537 605
… …
545char **rxvt_environ; // startup environment 613char **rxvt_environ; // startup environment
546 614
547void 615void
548rxvt_init () 616rxvt_init ()
549{ 617{
550 uid_t uid = getuid (); 618 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 619
581 rxvt_environ = environ; 620 rxvt_environ = environ;
582 621
583 signal (SIGHUP, SIG_IGN); 622 signal (SIGHUP, SIG_IGN);
584 signal (SIGPIPE, SIG_IGN); 623 signal (SIGPIPE, SIG_IGN);
… …
632 return p; 671 return p;
633} 672}
634 673
635/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
636/* 675/*
637 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
638 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
639 */ 678 */
640void 679void
641rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
642{ 681{
643 short recalc_x, recalc_y; 682 short recalc_x, recalc_y;
644 int x, y, sb_w, flags; 683 int x, y, sb_w, flags;
645 unsigned int w, h; 684 unsigned int w, h;
646 unsigned int max_width, max_height; 685 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 686
652 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 687 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
653 szHint.win_gravity = NorthWestGravity; 688 szHint.win_gravity = NorthWestGravity;
654 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 689 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
655 690
… …
717 752
718 if (scrollBar.state) 753 if (scrollBar.state)
719 { 754 {
720 sb_w = scrollbar_TotalWidth (); 755 sb_w = scrollbar_TotalWidth ();
721 szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
757
722 if (!OPTION (Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
723 window_vt_x += sb_w; 759 window_vt_x += sb_w;
724 } 760 }
725 761
726 szHint.width_inc = fwidth; 762 szHint.width_inc = fwidth;
727 szHint.height_inc = fheight; 763 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
730 766
731 if (newwidth && newwidth - szHint.base_width < max_width) 767 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 768 {
733 szHint.width = newwidth; 769 szHint.width = newwidth;
… …
748 { 784 {
749 min_it (height, max_height); 785 min_it (height, max_height);
750 szHint.height = szHint.base_height + height; 786 szHint.height = szHint.base_height + height;
751 } 787 }
752 788
753 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
755 791
756 if (recalc_x) 792 if (recalc_x)
757 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
794
758 if (recalc_y) 795 if (recalc_y)
759 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
760 797
761 ncol = width / fwidth; 798 ncol = width / fwidth;
762 nrow = height / fheight; 799 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} 800}
768 801
769/*----------------------------------------------------------------------*/ 802/*----------------------------------------------------------------------*/
770/* 803/*
771 * Tell the teletype handler what size the window is. 804 * Tell the teletype handler what size the window is.
… …
823 delete fontset[0]; 856 delete fontset[0];
824 fontset[0] = fs; 857 fontset[0] = fs;
825 858
826 prop = (*fs)[1]->properties (); 859 prop = (*fs)[1]->properties ();
827 prop.height += lineSpace; 860 prop.height += lineSpace;
861
828 fs->set_prop (prop); 862 fs->set_prop (prop, false);
829 863
830 fwidth = prop.width; 864 fwidth = prop.width;
831 fheight = prop.height; 865 fheight = prop.height;
832 fbase = prop.ascent; 866 fbase = prop.ascent;
833 867
… …
842 { 876 {
843 fontset[style] = fs = new rxvt_fontset (this); 877 fontset[style] = fs = new rxvt_fontset (this);
844 rxvt_fontprop prop2 = prop; 878 rxvt_fontprop prop2 = prop;
845 879
846 if (res) 880 if (res)
847 prop2.weight = prop2.slant = rxvt_fontprop::unset; 881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
848 else 885 else
849 { 886 {
850 res = fontset[0]->fontdesc; 887 fs->populate (fontset[0]->fontdesc);
851 888
852 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 889 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; 890 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
891
892 fs->set_prop (prop2, true);
854 } 893 }
855 894
856 fs->populate (res);
857 fs->set_prop (prop2);
858 } 895 }
859#else 896#else
860 fontset[style] = fontset[0]; 897 fontset[style] = fontset[0];
861#endif 898#endif
862 } 899 }
… …
871 return true; 908 return true;
872} 909}
873 910
874void rxvt_term::set_string_property (Atom prop, const char *str, int len) 911void rxvt_term::set_string_property (Atom prop, const char *str, int len)
875{ 912{
876 XChangeProperty (display->display, parent[0], 913 XChangeProperty (dpy, parent[0],
877 prop, XA_STRING, 8, PropModeReplace, 914 prop, XA_STRING, 8, PropModeReplace,
878 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 915 (const unsigned char *)str, len >= 0 ? len : strlen (str));
879} 916}
880 917
881void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
882{ 919{
883 wchar_t *ws = rxvt_mbstowcs (str, len); 920 wchar_t *ws = rxvt_mbstowcs (str, len);
884 char *s = rxvt_wcstoutf8 (ws); 921 char *s = rxvt_wcstoutf8 (ws);
885 922
886 XChangeProperty (display->display, parent[0], 923 XChangeProperty (dpy, parent[0],
887 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
888 (const unsigned char *)s, strlen (s)); 925 (const unsigned char *)s, strlen (s));
889 926
890 free (s); 927 free (s);
891 free (ws); 928 free (ws);
… …
916void 953void
917rxvt_term::set_window_color (int idx, const char *color) 954rxvt_term::set_window_color (int idx, const char *color)
918{ 955{
919 rxvt_color xcol; 956 rxvt_color xcol;
920 int i; 957 int i;
921 958
922 if (color == NULL || *color == '\0') 959 if (color == NULL || *color == '\0')
923 return; 960 return;
961
962 color = strdup (color);
963 allocated.push_back ((void *)color);
964 rs[Rs_color + idx] = color;
924 965
925 /* handle color aliases */ 966 /* handle color aliases */
926 if (isdigit (*color)) 967 if (isdigit (*color))
927 { 968 {
928 i = atoi (color); 969 i = atoi (color);
929 970
930 if (i >= 8 && i <= 15) 971 if (i >= 8 && i <= 15)
931 { /* bright colors */ 972 { /* bright colors */
932 i -= 8; 973 i -= 8;
933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
934 SET_PIXCOLOR (idx);
935 goto done; 975 goto done;
936 } 976 }
937 977
938 if (i >= 0 && i <= 7) 978 if (i >= 0 && i <= 7)
939 { /* normal colors */ 979 { /* normal colors */
940 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
941 SET_PIXCOLOR (idx);
942 goto done; 981 goto done;
943 } 982 }
944 } 983 }
945 984
946 if (!rXParseAllocColor (&xcol, color)) 985 set_color (xcol, color);
947 return;
948
949 /* XStoreColor (display->display, display->cmap, XColor*); */
950 986
951 /* 987 /*
952 * FIXME: should free colors here, but no idea how to do it so instead, 988 * FIXME: should free colors here, but no idea how to do it so instead,
953 * so just keep gobbling up the colormap 989 * so just keep gobbling up the colormap
954 */ 990 */
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 991
967 pix_colors_focused[idx] = xcol; 992 pix_colors_focused[idx] = xcol;
968 SET_PIXCOLOR (idx);
969 993
970 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
971 /* Cursor cursor; */ 995 /* Cursor cursor; */
972done: 996done:
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. */ 997 /*TODO: handle Color_BD, scrollbar background, etc. */
980 998
999 update_fade_color (idx);
981 recolour_cursor (); 1000 recolour_cursor ();
982 scr_recolour (); 1001 scr_recolour ();
983} 1002}
984 1003
985#else 1004#else
… …
987#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
988 1007
989void 1008void
990rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
991{ 1010{
992 XColor xcol[2]; 1011 XColor fg, bg;
993 1012
994 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
995 ? pix_colors_focused[Color_pointer_fg] 1014 ? pix_colors_focused[Color_pointer_fg]
996 : pix_colors_focused[Color_fg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
1016
997 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
998 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
999 : pix_colors_focused[Color_bg]; 1019 : pix_colors_focused[Color_bg]).get (bg);
1000 1020
1001 XQueryColors (display->display, display->cmap, xcol, 2); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1002 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1003} 1022}
1004 1023
1005/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
1006/* 1025/*
1007 * find if fg/bg matches any of the normal (low-intensity) colors 1026 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1011{ 1030{
1012 unsigned int i; 1031 unsigned int i;
1013 const char *xpmb = "\0"; 1032 const char *xpmb = "\0";
1014 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1015 1034
1016 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1017 strcpy (fstr, "default"); 1035 strcpy (fstr, "default");
1018 strcpy (bstr, "default"); 1036 strcpy (bstr, "default");
1019 for (i = Color_Black; i <= Color_White; i++) 1037 for (i = Color_Black; i <= Color_White; i++)
1020 if (pix_colors[Color_fg] == pix_colors[i]) 1038 if (pix_colors[Color_fg] == pix_colors[i])
1021 { 1039 {
… …
1036 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1037} 1055}
1038 1056
1039/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
1040 1058
1041int 1059bool
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1060rxvt_term::set_color (rxvt_color &color, const char *name)
1043{ 1061{
1044 if (!screen_in_out->set (display, colour)) 1062 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; 1063 return true;
1064
1065 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1066 return false;
1067}
1068
1069void
1070rxvt_term::alias_color (int dst, int src)
1071{
1072 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1051} 1073}
1052 1074
1053/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
1056void 1078void
1057rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1079rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1058{ 1080{
1059 int fix_screen; 1081 int fix_screen;
1060 int old_width = szHint.width, old_height = szHint.height; 1082 int old_width = szHint.width;
1061 dDisp; 1083 int old_height = szHint.height;
1062 1084
1063 window_calc (newwidth, newheight); 1085 window_calc (newwidth, newheight);
1086
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1064 XSetWMNormalHints (disp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1065 1089
1066 if (!ignoreparent) 1090 if (!ignoreparent)
1067 { 1091 {
1068#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1069 /* 1093 /*
… …
1073 int x, y, x1, y1; 1097 int x, y, x1, y1;
1074 int dx, dy; 1098 int dx, dy;
1075 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1076 Window unused_cr; 1100 Window unused_cr;
1077 1101
1078 XTranslateCoordinates (disp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1079 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1080 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1081 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1082 /* 1106 /*
1083 * if display->root isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
1084 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1085 */ 1109 */
… …
1087 { 1111 {
1088 x -= x1; 1112 x -= x1;
1089 y -= y1; 1113 y -= y1;
1090 } 1114 }
1091 1115
1092 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1093 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1094 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1095 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1096 1120
1097 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1098 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
1099 dx = 0; 1123 dx = 0;
… …
1102 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1103 dy = 0; 1127 dy = 0;
1104 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1105 dy /= 2; 1129 dy /= 2;
1106 1130
1107 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1108 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1109#else 1133#else
1110 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1111#endif 1135#endif
1112 } 1136 }
1113 1137
1114 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1115 1139
1116 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1117 { 1141 {
1118 if (scrollBar.state) 1142 if (scrollBar.state)
1119 { 1143 {
1120 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1121 window_sb_x, 0, 1145 window_sb_x, 0,
1122 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1123 resize_scrollbar (); 1147 resize_scrollbar ();
1124 } 1148 }
1125 1149
1126 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (dpy, vt,
1127 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1128 width, height); 1152 width, height);
1129 1153
1130 scr_clear (); 1154 scr_clear ();
1131#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
1132 resize_pixmap (); 1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
1133#endif 1158#endif
1134 } 1159 }
1135 1160
1136 if (fix_screen || old_height == 0) 1161 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 (); 1162 scr_reset ();
1151 1163
1152 if (curr_screen >= 0) /* this is not the first time through */ 1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1153 { 1165 //scr_touch (false);
1154 scr_change_screen (curr_screen);
1155 selection_check (old_ncol != ncol ? 4 : 0);
1156 }
1157 }
1158 1166
1159 old_width = szHint.width; 1167#ifdef HAVE_BG_PIXMAP
1160 old_height = szHint.height; 1168 if (bgPixmap.pixmap)
1161
1162#ifdef XPM_BACKGROUND
1163 if (pixmap)
1164 scr_touch (false); 1169 scr_touch (false);
1165#endif 1170#endif
1166 1171
1167#ifdef USE_XIM 1172#ifdef USE_XIM
1168 IMSetStatusPosition (); 1173 IMSetPosition ();
1169#endif 1174#endif
1170} 1175}
1171 1176
1172/* 1177/*
1173 * Set the width/height of the vt window in characters. Units are pixels. 1178 * Set the width/height of the vt window in characters. Units are pixels.
… …
1178{ 1183{
1179 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1180 1185
1181 if (newwidth == 0 || newheight == 0) 1186 if (newwidth == 0 || newheight == 0)
1182 { 1187 {
1183 XGetWindowAttributes (display->display, display->root, &wattr); 1188 XGetWindowAttributes (dpy, display->root, &wattr);
1184 1189
1185 if (newwidth == 0) 1190 if (newwidth == 0)
1186 newwidth = wattr.width - szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
1187 if (newheight == 0) 1192 if (newheight == 0)
1188 newheight = wattr.height - szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
… …
1202#ifdef USE_XIM 1207#ifdef USE_XIM
1203 1208
1204void 1209void
1205rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1206{ 1211{
1207 fg = pix_colors[Color_fg]; 1212 fg = pix_colors [Color_fg];
1208 bg = pix_colors[Color_bg]; 1213 bg = pix_colors [Color_bg];
1209} 1214}
1210 1215
1211void 1216void
1212rxvt_term::im_set_size (XRectangle &size) 1217rxvt_term::im_set_size (XRectangle &size)
1213{ 1218{
… …
1250 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1251 1256
1252 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1253 *p = '\0'; 1258 *p = '\0';
1254 1259
1255 atom = XInternAtom (display->display, server, False); 1260 atom = XInternAtom (dpy, server, False);
1256 win = XGetSelectionOwner (display->display, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1257 1262
1258 if (win != None) 1263 if (win != None)
1259 return True; 1264 return True;
1260 } 1265 }
1261 1266
… …
1268 XPoint nspot; 1273 XPoint nspot;
1269 XVaNestedList preedit_attr; 1274 XVaNestedList preedit_attr;
1270 1275
1271 if (!Input_Context 1276 if (!Input_Context
1272 || !focus 1277 || !focus
1273 || !(input_style & XIMPreeditPosition)) 1278 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1274 return; 1279 return;
1275 1280
1276 im_set_position (nspot); 1281 im_set_position (nspot);
1277 1282
1278 if (nspot.x == spot.x && nspot.y == spot.y) 1283 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1297 input_method = 0; 1302 input_method = 0;
1298 } 1303 }
1299 1304
1300 Input_Context = 0; 1305 Input_Context = 0;
1301} 1306}
1307
1308#ifdef ENABLE_XIM_ONTHESPOT
1309
1310static void
1311xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1312{
1313 ((rxvt_term *)client_data)->make_current ();
1314 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1315}
1316
1317static void
1318xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1322}
1323
1324static void
1325xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1326{
1327 rxvt_term *term = (rxvt_term *)client_data;
1328 XIMText *text = call_data->text;
1329
1330 term->make_current ();
1331
1332 if (text)
1333 {
1334 void *str;
1335
1336 if (!text->encoding_is_wchar && text->string.multi_byte)
1337 {
1338 // of course, X makes it ugly again
1339 if (term->rs[Rs_imLocale])
1340 SET_LOCALE (term->rs[Rs_imLocale]);
1341
1342 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1343 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1344
1345 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->locale);
1347 }
1348 else
1349 str = (void *)text->string.wide_char;
1350
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length,
1355 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1356 DT_WCS_LEN, str, str ? (int)text->length : 0,
1357 DT_END));
1358 }
1359 else
1360 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1361 DT_INT, call_data->caret,
1362 DT_INT, call_data->chg_first,
1363 DT_INT, call_data->chg_length,
1364 DT_END));
1365}
1366
1367#if 0
1368static void
1369xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1370{
1371 ((rxvt_term *)client_data)->make_current ();
1372 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1373 DT_INT, call_data->position,
1374 DT_INT, call_data->direction,
1375 DT_INT, call_data->style,
1376 DT_END));
1377}
1378#endif
1379
1380#endif
1302 1381
1303/* 1382/*
1304 * Try to open a XIM with the current modifiers, then see if we can 1383 * Try to open a XIM with the current modifiers, then see if we can
1305 * open a suitable preedit type 1384 * open a suitable preedit type
1306 */ 1385 */
… …
1313 XRectangle rect, status_rect, needed_rect; 1392 XRectangle rect, status_rect, needed_rect;
1314 unsigned long fg, bg; 1393 unsigned long fg, bg;
1315 const char *p; 1394 const char *p;
1316 char **s; 1395 char **s;
1317 XIMStyles *xim_styles; 1396 XIMStyles *xim_styles;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 XIMCallback xcb[4];
1399#endif
1318 1400
1319 set_environ (envv); 1401 set_environ (envv);
1320 1402
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1403 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1404 return false;
1323 1405
1324 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1325 input_method = display->get_xim (locale, modifiers); 1406 input_method = display->get_xim (locale, modifiers);
1326 if (input_method == NULL) 1407 if (input_method == NULL)
1327 return false; 1408 return false;
1328 1409
1329 xim = input_method->xim; 1410 xim = input_method->xim;
… …
1349 s = rxvt_splitcommastring (p); 1430 s = rxvt_splitcommastring (p);
1350 1431
1351 for (i = found = 0; !found && s[i]; i++) 1432 for (i = found = 0; !found && s[i]; i++)
1352 { 1433 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1434 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = (XIMPreeditPosition | XIMStatusNothing); 1435 input_style = XIMPreeditPosition | XIMStatusNothing;
1355 else if (!strcmp (s[i], "OffTheSpot")) 1436 else if (!strcmp (s[i], "OffTheSpot"))
1356 input_style = (XIMPreeditArea | XIMStatusArea); 1437 input_style = XIMPreeditArea | XIMStatusArea;
1357 else if (!strcmp (s[i], "Root")) 1438 else if (!strcmp (s[i], "Root"))
1358 input_style = (XIMPreeditNothing | XIMStatusNothing); 1439 input_style = XIMPreeditNothing | XIMStatusNothing;
1359 else if (!strcmp (s[i], "None")) 1440 else if (!strcmp (s[i], "None"))
1360 input_style = (XIMPreeditNone | XIMStatusNone); 1441 input_style = XIMPreeditNone | XIMStatusNone;
1442#ifdef ENABLE_XIM_ONTHESPOT
1443 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1444 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1445#endif
1446 else
1447 input_style = XIMPreeditNothing | XIMStatusNothing;
1361 1448
1362 for (j = 0; j < xim_styles->count_styles; j++) 1449 for (j = 0; j < xim_styles->count_styles; j++)
1363 if (input_style == xim_styles->supported_styles[j]) 1450 if (input_style == xim_styles->supported_styles[j])
1364 { 1451 {
1365 rxvt_freecommastring (s); 1452 rxvt_freecommastring (s);
… …
1403 "*", 1490 "*",
1404 fheight, 1491 fheight,
1405 fheight + 1, fheight - 1, 1492 fheight + 1, fheight - 1,
1406 fheight - 2, fheight + 2); 1493 fheight - 2, fheight + 2);
1407 1494
1408 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1495 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1409 &missing_charset_list, &missing_charset_count, &def_string); 1496 &missing_charset_list, &missing_charset_count, &def_string);
1410 1497
1411 if (missing_charset_list) 1498 if (missing_charset_list)
1412 XFreeStringList (missing_charset_list); 1499 XFreeStringList (missing_charset_list);
1413 1500
… …
1454 XNBackground, bg, 1541 XNBackground, bg,
1455 XNArea, &status_rect, 1542 XNArea, &status_rect,
1456 XNFontSet, fs, 1543 XNFontSet, fs,
1457 NULL); 1544 NULL);
1458 } 1545 }
1546#if ENABLE_XIM_ONTHESPOT
1547 else if (input_style & XIMPreeditCallbacks)
1548 {
1549 im_set_position (spot);
1550
1551 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1552 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1553 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1554# if 0
1555 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1556# endif
1557
1558 preedit_attr = XVaCreateNestedList (0,
1559 XNSpotLocation, &spot,
1560 XNPreeditStartCallback, &xcb[0],
1561 XNPreeditDoneCallback , &xcb[1],
1562 XNPreeditDrawCallback , &xcb[2],
1563# if 0
1564 XNPreeditCaretCallback, &xcb[3],
1565# endif
1566 NULL);
1567 }
1568#endif
1459 1569
1460 Input_Context = XCreateIC (xim, 1570 Input_Context = XCreateIC (xim,
1461 XNInputStyle, input_style, 1571 XNInputStyle, input_style,
1462 XNClientWindow, vt, 1572 XNClientWindow, vt,
1463 XNFocusWindow, parent[0], 1573 XNFocusWindow, parent[0],
… …
1465 preedit_attr, 1575 preedit_attr,
1466 status_attr ? XNStatusAttributes : NULL, 1576 status_attr ? XNStatusAttributes : NULL,
1467 status_attr, NULL); 1577 status_attr, NULL);
1468 1578
1469 if (preedit_attr) XFree (preedit_attr); 1579 if (preedit_attr) XFree (preedit_attr);
1470 if (status_attr) XFree (status_attr); 1580 if (status_attr) XFree (status_attr);
1471 if (fs) XFreeFontSet (display->display, fs); 1581 if (fs) XFreeFontSet (dpy, fs);
1472 1582
1473 if (Input_Context == NULL) 1583 if (Input_Context == NULL)
1474 { 1584 {
1475 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1585 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1476 im_destroy (); 1586 im_destroy ();
1477 return false; 1587 return false;
1478 } 1588 }
1479 1589
1480 if (input_style & XIMPreeditArea) 1590#if 0
1591 // unfortunately, only the focus window is used by XIM, hard to fix
1592 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1593 vt_select_input ();
1594#endif
1595
1481 IMSetStatusPosition (); 1596 IMSetPosition ();
1482 1597
1483 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1484 return true; 1598 return true;
1485} 1599}
1486 1600
1487void 1601void
1488rxvt_term::im_cb () 1602rxvt_term::im_cb ()
… …
1494 1608
1495 make_current (); 1609 make_current ();
1496 1610
1497 im_destroy (); 1611 im_destroy ();
1498 1612
1499 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1500 if (Input_Context) 1613 if (Input_Context)
1501 return; 1614 return;
1502 1615
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1617 if (rs[Rs_imLocale])
… …
1546 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1547#endif 1660#endif
1548} 1661}
1549 1662
1550void 1663void
1551rxvt_term::IMSetStatusPosition () 1664rxvt_term::IMSetPosition ()
1552{ 1665{
1553 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1554 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1555 1668
1556 if (!Input_Context 1669 if (!Input_Context
1557 || !focus 1670 || !focus
1558 || !(input_style & XIMPreeditArea) 1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1559 || !IMisRunning ()) 1672 || !IMisRunning ())
1560 return; 1673 return;
1561 1674
1675 if (input_style & XIMPreeditPosition)
1676 {
1677 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679
1680 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL);
1682 }
1683 else
1684 {
1562 /* Getting the necessary width of preedit area */ 1685 /* Getting the necessary width of preedit area */
1563 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1686 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1687 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565 XFree (status_attr); 1688 XFree (status_attr);
1566 1689
1567 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1690 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1568 XFree (needed_rect); 1691 XFree (needed_rect);
1569 1692
1570 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1693 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1571 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1572 1695
1573 XSetICValues (Input_Context, 1696 XSetICValues (Input_Context,
1574 XNPreeditAttributes, preedit_attr, 1697 XNPreeditAttributes, preedit_attr,
1575 XNStatusAttributes, status_attr, NULL); 1698 XNStatusAttributes, status_attr,
1699 NULL);
1576 1700
1701 XFree (status_attr);
1702 }
1703
1577 XFree (preedit_attr); 1704 XFree (preedit_attr);
1578 XFree (status_attr);
1579} 1705}
1580#endif /* USE_XIM */ 1706#endif /* USE_XIM */
1581 1707
1582/*----------------------- end-of-file (C source) -----------------------*/ 1708/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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