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.190 by root, Thu Jan 19 20:30:36 2006 UTC vs.
Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC

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

Diff Legend

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