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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.241 by sasha, Mon Aug 13 22:41:34 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
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
216#endif 225#endif
217 delete fontset[0]; 226 delete fontset[0];
218 227
219 if (display) 228 if (display)
220 { 229 {
221 dDisp;
222
223 selection_clear (); 230 selection_clear ();
224 231
225#ifdef USE_XIM 232#ifdef USE_XIM
226 im_destroy (); 233 im_destroy ();
227#endif 234#endif
228#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 238#endif
232#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 241#endif
235#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 253#endif
247#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 258#endif
252 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
253 260
254 delete drawable; 261 delete drawable;
255 // destroy all windows 262 // destroy all windows
256 if (parent[0]) 263 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
258 }
259 265
260 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
262#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
263 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
264#endif 281#endif
265 282
266 displays.put (display); 283 displays.put (display);
267 284
268 scr_release (); 285 scr_release ();
… …
271 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 289 free (allocated [i]);
273 290
274 free (selection.text); 291 free (selection.text);
275 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 293 free (env_display);
278 free (env_term); 294 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 295 free (locale);
281 free (v_buffer); 296 free (v_buffer);
282 free (incr_buf); 297 free (incr_buf);
283 298
284 delete envv; 299 delete envv;
… …
295{ 310{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 312
298 cmd_pid = 0; 313 cmd_pid = 0;
299 314
300 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
301 destroy (); 316 destroy ();
302} 317}
303 318
304void 319void
305rxvt_term::destroy () 320rxvt_term::destroy ()
306{ 321{
307 if (destroy_ev.active) 322 if (destroy_ev.active)
308 return; 323 return;
309 324
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 326
313#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
314 scr_overlay_off (); 328 scr_overlay_off ();
315#endif 329#endif
316 330
… …
320 im_ev.stop (display); 334 im_ev.stop (display);
321#endif 335#endif
322#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
324#endif 338#endif
325#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
327#endif 341#endif
328 incr_ev.stop (); 342 incr_ev.stop ();
329 termwin_ev.stop (display); 343 termwin_ev.stop (display);
330 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
371{ 385{
372 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++)
373 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
374} 388}
375 389
376#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
377static void 391static void
378print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
379{ 393{
380 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
430 else 444 else
431 { 445 {
432 // 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,
433 // so just output the error and continue 447 // so just output the error and continue
434#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
435 print_x_error (display, event); 451 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 452#endif
439 } 453 }
440 454
441 return 0; 455 return 0;
442} 456}
… …
450 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
451} 465}
452 466
453/*----------------------------------------------------------------------*/ 467/*----------------------------------------------------------------------*/
454bool 468bool
455rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{ 470{
471 this->envv = envv;
472
457 SET_R (this); 473 SET_R (this);
458 set_locale (""); 474 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :( 475 set_environ (envv); // few things in X do not call setlocale :(
460 476
461 if (!init_vars ()) 477 if (!init_vars ())
… …
468#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
469 keyboard->register_done (); 485 keyboard->register_done ();
470#endif 486#endif
471 487
472#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
475#endif 491#endif
476 492
477 pty = rxvt_new_ptytty (); 493 pty = ptytty::create ();
478 494
479 create_windows (argc, argv); 495 create_windows (argc, argv);
480 496
481 dDisp;
482
483 init_xlocale (); 497 init_xlocale ();
484 498
485 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
486 500
487#if 0 501#if 0
488 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
489#endif 503#endif
490 504
491#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
492 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
493 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
494#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
495#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
496 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
497 { 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 ();
498 XSelectInput (disp, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
499 check_our_parents ();
500 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
501 } 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 ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
502#endif 560#endif
503 561
504 set_colorfgbg (); 562 set_colorfgbg ();
505 563
506 init_command (cmd_argv); 564 init_command (cmd_argv);
… …
512 570
513 check_ev.start (); 571 check_ev.start ();
514 572
515 HOOK_INVOKE ((this, HOOK_START, DT_END)); 573 HOOK_INVOKE ((this, HOOK_START, DT_END));
516 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
517 XMapWindow (disp, vt); 585 XMapWindow (dpy, vt);
518 XMapWindow (disp, parent[0]); 586 XMapWindow (dpy, parent[0]);
519 587
520 return true; 588 return true;
521} 589}
522 590
523static struct sig_handlers 591static struct sig_handlers
… …
528 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
529 */ 597 */
530 void 598 void
531 sig_term (sig_watcher &w) 599 sig_term (sig_watcher &w)
532 { 600 {
533#ifdef DEBUG_CMD
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup (); 601 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL); 602 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum); 603 kill (getpid (), w.signum);
539 } 604 }
540 605
… …
548char **rxvt_environ; // startup environment 613char **rxvt_environ; // startup environment
549 614
550void 615void
551rxvt_init () 616rxvt_init ()
552{ 617{
553 uid_t uid = getuid (); 618 ptytty::init ();
554 gid_t gid = getgid ();
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566
567 // drop privileges
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583 619
584 rxvt_environ = environ; 620 rxvt_environ = environ;
585 621
586 signal (SIGHUP, SIG_IGN); 622 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 623 signal (SIGPIPE, SIG_IGN);
… …
635 return p; 671 return p;
636} 672}
637 673
638/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
639/* 675/*
640 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
642 */ 678 */
643void 679void
644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 681{
646 short recalc_x, recalc_y; 682 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 683 int x, y, sb_w, flags;
648 unsigned int w, h; 684 unsigned int w, h;
649 unsigned int max_width, max_height; 685 unsigned int max_width, max_height;
650 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 686
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 687 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 688 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 689 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 690
… …
720 752
721 if (scrollBar.state) 753 if (scrollBar.state)
722 { 754 {
723 sb_w = scrollbar_TotalWidth (); 755 sb_w = scrollbar_TotalWidth ();
724 szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
757
725 if (!OPTION (Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
726 window_vt_x += sb_w; 759 window_vt_x += sb_w;
727 } 760 }
728 761
729 szHint.width_inc = fwidth; 762 szHint.width_inc = fwidth;
730 szHint.height_inc = fheight; 763 szHint.height_inc = fheight;
731 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
732 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
733 766
734 if (newwidth && newwidth - szHint.base_width < max_width) 767 if (newwidth && newwidth - szHint.base_width < max_width)
735 { 768 {
736 szHint.width = newwidth; 769 szHint.width = newwidth;
… …
751 { 784 {
752 min_it (height, max_height); 785 min_it (height, max_height);
753 szHint.height = szHint.base_height + height; 786 szHint.height = szHint.base_height + height;
754 } 787 }
755 788
756 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
757 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
758 791
759 if (recalc_x) 792 if (recalc_x)
760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
794
761 if (recalc_y) 795 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 797
764 ncol = width / fwidth; 798 ncol = width / fwidth;
765 nrow = height / fheight; 799 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 800}
771 801
772/*----------------------------------------------------------------------*/ 802/*----------------------------------------------------------------------*/
773/* 803/*
774 * Tell the teletype handler what size the window is. 804 * Tell the teletype handler what size the window is.
… …
826 delete fontset[0]; 856 delete fontset[0];
827 fontset[0] = fs; 857 fontset[0] = fs;
828 858
829 prop = (*fs)[1]->properties (); 859 prop = (*fs)[1]->properties ();
830 prop.height += lineSpace; 860 prop.height += lineSpace;
861
831 fs->set_prop (prop); 862 fs->set_prop (prop, false);
832 863
833 fwidth = prop.width; 864 fwidth = prop.width;
834 fheight = prop.height; 865 fheight = prop.height;
835 fbase = prop.ascent; 866 fbase = prop.ascent;
836 867
… …
845 { 876 {
846 fontset[style] = fs = new rxvt_fontset (this); 877 fontset[style] = fs = new rxvt_fontset (this);
847 rxvt_fontprop prop2 = prop; 878 rxvt_fontprop prop2 = prop;
848 879
849 if (res) 880 if (res)
850 prop2.weight = prop2.slant = rxvt_fontprop::unset; 881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
851 else 885 else
852 { 886 {
853 res = fontset[0]->fontdesc; 887 fs->populate (fontset[0]->fontdesc);
854 888
855 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;
856 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);
857 } 893 }
858 894
859 fs->populate (res);
860 fs->set_prop (prop2);
861 } 895 }
862#else 896#else
863 fontset[style] = fontset[0]; 897 fontset[style] = fontset[0];
864#endif 898#endif
865 } 899 }
… …
874 return true; 908 return true;
875} 909}
876 910
877void 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)
878{ 912{
879 XChangeProperty (display->display, parent[0], 913 XChangeProperty (dpy, parent[0],
880 prop, XA_STRING, 8, PropModeReplace, 914 prop, XA_STRING, 8, PropModeReplace,
881 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 915 (const unsigned char *)str, len >= 0 ? len : strlen (str));
882} 916}
883 917
884void 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)
885{ 919{
886 wchar_t *ws = rxvt_mbstowcs (str, len); 920 wchar_t *ws = rxvt_mbstowcs (str, len);
887 char *s = rxvt_wcstoutf8 (ws); 921 char *s = rxvt_wcstoutf8 (ws);
888 922
889 XChangeProperty (display->display, parent[0], 923 XChangeProperty (dpy, parent[0],
890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
891 (const unsigned char *)s, strlen (s)); 925 (const unsigned char *)s, strlen (s));
892 926
893 free (s); 927 free (s);
894 free (ws); 928 free (ws);
… …
919void 953void
920rxvt_term::set_window_color (int idx, const char *color) 954rxvt_term::set_window_color (int idx, const char *color)
921{ 955{
922 rxvt_color xcol; 956 rxvt_color xcol;
923 int i; 957 int i;
924 958
925 if (color == NULL || *color == '\0') 959 if (color == NULL || *color == '\0')
926 return; 960 return;
961
962 color = strdup (color);
963 allocated.push_back ((void *)color);
964 rs[Rs_color + idx] = color;
927 965
928 /* handle color aliases */ 966 /* handle color aliases */
929 if (isdigit (*color)) 967 if (isdigit (*color))
930 { 968 {
931 i = atoi (color); 969 i = atoi (color);
932 970
933 if (i >= 8 && i <= 15) 971 if (i >= 8 && i <= 15)
934 { /* bright colors */ 972 { /* bright colors */
935 i -= 8; 973 i -= 8;
936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
937 SET_PIXCOLOR (idx);
938 goto done; 975 goto done;
939 } 976 }
940 977
941 if (i >= 0 && i <= 7) 978 if (i >= 0 && i <= 7)
942 { /* normal colors */ 979 { /* normal colors */
943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
944 SET_PIXCOLOR (idx);
945 goto done; 981 goto done;
946 } 982 }
947 } 983 }
948 984
949 if (!rXParseAllocColor (&xcol, color)) 985 set_color (xcol, color);
950 return;
951
952 /* XStoreColor (display->display, display->cmap, XColor*); */
953 986
954 /* 987 /*
955 * 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,
956 * so just keep gobbling up the colormap 989 * so just keep gobbling up the colormap
957 */ 990 */
958# if 0
959 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[idx] == pix_colors[i])
961 break;
962 if (i > Color_White)
963 {
964 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
965 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
966 DisplayPlanes (display->display, display->screen));
967 }
968# endif
969 991
970 pix_colors_focused[idx] = xcol; 992 pix_colors_focused[idx] = xcol;
971 SET_PIXCOLOR (idx);
972 993
973 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
974 /* Cursor cursor; */ 995 /* Cursor cursor; */
975done: 996done:
976
977#if OFF_FOCUS_FADING
978 if (rs[Rs_fade])
979 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
980#endif
981
982 /*TODO: handle Color_BD, scrollbar background, etc. */ 997 /*TODO: handle Color_BD, scrollbar background, etc. */
983 998
999 update_fade_color (idx);
984 recolour_cursor (); 1000 recolour_cursor ();
985 scr_recolour (); 1001 scr_recolour ();
986} 1002}
987 1003
988#else 1004#else
… …
990#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
991 1007
992void 1008void
993rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
994{ 1010{
995 XColor xcol[2]; 1011 XColor fg, bg;
996 1012
997 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
998 ? pix_colors_focused[Color_pointer_fg] 1014 ? pix_colors_focused[Color_pointer_fg]
999 : pix_colors_focused[Color_fg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
1016
1000 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
1001 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
1002 : pix_colors_focused[Color_bg]; 1019 : pix_colors_focused[Color_bg]).get (bg);
1003 1020
1004 XQueryColors (display->display, display->cmap, xcol, 2); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1005 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1006} 1022}
1007 1023
1008/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
1009/* 1025/*
1010 * 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
… …
1014{ 1030{
1015 unsigned int i; 1031 unsigned int i;
1016 const char *xpmb = "\0"; 1032 const char *xpmb = "\0";
1017 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1018 1034
1019 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 strcpy (fstr, "default"); 1035 strcpy (fstr, "default");
1021 strcpy (bstr, "default"); 1036 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 1037 for (i = Color_Black; i <= Color_White; i++)
1023 if (pix_colors[Color_fg] == pix_colors[i]) 1038 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 1039 {
… …
1039 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1040} 1055}
1041 1056
1042/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
1043 1058
1044int 1059bool
1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1060rxvt_term::set_color (rxvt_color &color, const char *name)
1046{ 1061{
1047 if (!screen_in_out->set (display, colour)) 1062 if (color.set (this, name))
1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1050 return false;
1051 }
1052
1053 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]);
1054} 1073}
1055 1074
1056/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
1057 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
1058 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
1059void 1078void
1060rxvt_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)
1061{ 1080{
1062 int fix_screen; 1081 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 1082 int old_width = szHint.width;
1064 dDisp; 1083 int old_height = szHint.height;
1065 1084
1066 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)))
1067 XSetWMNormalHints (disp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1068 1089
1069 if (!ignoreparent) 1090 if (!ignoreparent)
1070 { 1091 {
1071#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1072 /* 1093 /*
… …
1076 int x, y, x1, y1; 1097 int x, y, x1, y1;
1077 int dx, dy; 1098 int dx, dy;
1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1079 Window unused_cr; 1100 Window unused_cr;
1080 1101
1081 XTranslateCoordinates (disp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1082 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1085 /* 1106 /*
1086 * 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
1087 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1088 */ 1109 */
… …
1090 { 1111 {
1091 x -= x1; 1112 x -= x1;
1092 y -= y1; 1113 y -= y1;
1093 } 1114 }
1094 1115
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1099 1120
1100 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
1102 dx = 0; 1123 dx = 0;
… …
1105 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1106 dy = 0; 1127 dy = 0;
1107 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1108 dy /= 2; 1129 dy /= 2;
1109 1130
1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1111 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1112#else 1133#else
1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1114#endif 1135#endif
1115 } 1136 }
1116 1137
1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1118 1139
1119 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1120 { 1141 {
1121 if (scrollBar.state) 1142 if (scrollBar.state)
1122 { 1143 {
1123 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1124 window_sb_x, 0, 1145 window_sb_x, 0,
1125 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1126 resize_scrollbar (); 1147 resize_scrollbar ();
1127 } 1148 }
1128 1149
1129 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (dpy, vt,
1130 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1131 width, height); 1152 width, height);
1132 1153
1133 scr_clear (); 1154 scr_clear ();
1134#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
1135 resize_pixmap (); 1156 /* TODO: should that really be here ? */
1157 bgPixmap.render ();
1136#endif 1158#endif
1137 } 1159 }
1138 1160
1139 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 1162 scr_reset ();
1154 1163
1155 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
1156 { 1165 //scr_touch (false);
1157 scr_change_screen (curr_screen);
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161 1166
1162 old_width = szHint.width; 1167#ifdef HAVE_BG_PIXMAP
1163 old_height = szHint.height; 1168 if (bgPixmap.pixmap)
1164
1165#ifdef XPM_BACKGROUND
1166 if (pixmap)
1167 scr_touch (false); 1169 scr_touch (false);
1168#endif 1170#endif
1169 1171
1170#ifdef USE_XIM 1172#ifdef USE_XIM
1171 IMSetStatusPosition (); 1173 IMSetPosition ();
1172#endif 1174#endif
1173} 1175}
1174 1176
1175/* 1177/*
1176 * 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.
… …
1181{ 1183{
1182 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1183 1185
1184 if (newwidth == 0 || newheight == 0) 1186 if (newwidth == 0 || newheight == 0)
1185 { 1187 {
1186 XGetWindowAttributes (display->display, display->root, &wattr); 1188 XGetWindowAttributes (dpy, display->root, &wattr);
1187 1189
1188 if (newwidth == 0) 1190 if (newwidth == 0)
1189 newwidth = wattr.width - szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
1190 if (newheight == 0) 1192 if (newheight == 0)
1191 newheight = wattr.height - szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
… …
1205#ifdef USE_XIM 1207#ifdef USE_XIM
1206 1208
1207void 1209void
1208rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1209{ 1211{
1210 fg = pix_colors[Color_fg]; 1212 fg = pix_colors [Color_fg];
1211 bg = pix_colors[Color_bg]; 1213 bg = pix_colors [Color_bg];
1212} 1214}
1213 1215
1214void 1216void
1215rxvt_term::im_set_size (XRectangle &size) 1217rxvt_term::im_set_size (XRectangle &size)
1216{ 1218{
… …
1253 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1254 1256
1255 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1256 *p = '\0'; 1258 *p = '\0';
1257 1259
1258 atom = XInternAtom (display->display, server, False); 1260 atom = XInternAtom (dpy, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1260 1262
1261 if (win != None) 1263 if (win != None)
1262 return True; 1264 return True;
1263 } 1265 }
1264 1266
… …
1271 XPoint nspot; 1273 XPoint nspot;
1272 XVaNestedList preedit_attr; 1274 XVaNestedList preedit_attr;
1273 1275
1274 if (!Input_Context 1276 if (!Input_Context
1275 || !focus 1277 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1278 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1279 return;
1278 1280
1279 im_set_position (nspot); 1281 im_set_position (nspot);
1280 1282
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1283 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1302 input_method = 0;
1301 } 1303 }
1302 1304
1303 Input_Context = 0; 1305 Input_Context = 0;
1304} 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
1305 1381
1306/* 1382/*
1307 * 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
1308 * open a suitable preedit type 1384 * open a suitable preedit type
1309 */ 1385 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1392 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1393 unsigned long fg, bg;
1318 const char *p; 1394 const char *p;
1319 char **s; 1395 char **s;
1320 XIMStyles *xim_styles; 1396 XIMStyles *xim_styles;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 XIMCallback xcb[4];
1399#endif
1321 1400
1322 set_environ (envv); 1401 set_environ (envv);
1323 1402
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1403 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1404 return false;
1326 1405
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1406 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1407 if (input_method == NULL)
1330 return false; 1408 return false;
1331 1409
1332 xim = input_method->xim; 1410 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1430 s = rxvt_splitcommastring (p);
1353 1431
1354 for (i = found = 0; !found && s[i]; i++) 1432 for (i = found = 0; !found && s[i]; i++)
1355 { 1433 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1434 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1435 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1436 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1437 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1438 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1439 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1440 else if (!strcmp (s[i], "None"))
1363 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;
1364 1448
1365 for (j = 0; j < xim_styles->count_styles; j++) 1449 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1450 if (input_style == xim_styles->supported_styles[j])
1367 { 1451 {
1368 rxvt_freecommastring (s); 1452 rxvt_freecommastring (s);
… …
1406 "*", 1490 "*",
1407 fheight, 1491 fheight,
1408 fheight + 1, fheight - 1, 1492 fheight + 1, fheight - 1,
1409 fheight - 2, fheight + 2); 1493 fheight - 2, fheight + 2);
1410 1494
1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1495 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1412 &missing_charset_list, &missing_charset_count, &def_string); 1496 &missing_charset_list, &missing_charset_count, &def_string);
1413 1497
1414 if (missing_charset_list) 1498 if (missing_charset_list)
1415 XFreeStringList (missing_charset_list); 1499 XFreeStringList (missing_charset_list);
1416 1500
… …
1457 XNBackground, bg, 1541 XNBackground, bg,
1458 XNArea, &status_rect, 1542 XNArea, &status_rect,
1459 XNFontSet, fs, 1543 XNFontSet, fs,
1460 NULL); 1544 NULL);
1461 } 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
1462 1569
1463 Input_Context = XCreateIC (xim, 1570 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1571 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1572 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1573 XNFocusWindow, parent[0],
… …
1468 preedit_attr, 1575 preedit_attr,
1469 status_attr ? XNStatusAttributes : NULL, 1576 status_attr ? XNStatusAttributes : NULL,
1470 status_attr, NULL); 1577 status_attr, NULL);
1471 1578
1472 if (preedit_attr) XFree (preedit_attr); 1579 if (preedit_attr) XFree (preedit_attr);
1473 if (status_attr) XFree (status_attr); 1580 if (status_attr) XFree (status_attr);
1474 if (fs) XFreeFontSet (display->display, fs); 1581 if (fs) XFreeFontSet (dpy, fs);
1475 1582
1476 if (Input_Context == NULL) 1583 if (Input_Context == NULL)
1477 { 1584 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1585 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1586 im_destroy ();
1480 return false; 1587 return false;
1481 } 1588 }
1482 1589
1483 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
1484 IMSetStatusPosition (); 1596 IMSetPosition ();
1485 1597
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1598 return true;
1488} 1599}
1489 1600
1490void 1601void
1491rxvt_term::im_cb () 1602rxvt_term::im_cb ()
… …
1497 1608
1498 make_current (); 1609 make_current ();
1499 1610
1500 im_destroy (); 1611 im_destroy ();
1501 1612
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1613 if (Input_Context)
1504 return; 1614 return;
1505 1615
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1617 if (rs[Rs_imLocale])
… …
1549 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1550#endif 1660#endif
1551} 1661}
1552 1662
1553void 1663void
1554rxvt_term::IMSetStatusPosition () 1664rxvt_term::IMSetPosition ()
1555{ 1665{
1556 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1557 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1558 1668
1559 if (!Input_Context 1669 if (!Input_Context
1560 || !focus 1670 || !focus
1561 || !(input_style & XIMPreeditArea) 1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1562 || !IMisRunning ()) 1672 || !IMisRunning ())
1563 return; 1673 return;
1564 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 {
1565 /* Getting the necessary width of preedit area */ 1685 /* Getting the necessary width of preedit area */
1566 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1686 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1567 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1687 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1568 XFree (status_attr); 1688 XFree (status_attr);
1569 1689
1570 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1690 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1571 XFree (needed_rect); 1691 XFree (needed_rect);
1572 1692
1573 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1693 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1574 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1575 1695
1576 XSetICValues (Input_Context, 1696 XSetICValues (Input_Context,
1577 XNPreeditAttributes, preedit_attr, 1697 XNPreeditAttributes, preedit_attr,
1578 XNStatusAttributes, status_attr, NULL); 1698 XNStatusAttributes, status_attr,
1699 NULL);
1579 1700
1701 XFree (status_attr);
1702 }
1703
1580 XFree (preedit_attr); 1704 XFree (preedit_attr);
1581 XFree (status_attr);
1582} 1705}
1583#endif /* USE_XIM */ 1706#endif /* USE_XIM */
1584 1707
1585/*----------------------- end-of-file (C source) -----------------------*/ 1708/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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