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.187 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.225 by root, Wed Jul 5 22:46:14 2006 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{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66void 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
167 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 171#endif
169#ifdef USE_XIM 172#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
171#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
172 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
174 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
181 188
182 termlist.push_back (this); 189 termlist.push_back (this);
183 190
184#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 193#endif
190} 194}
191 195
192// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
193// for use before an emergency exit 197// for use before an emergency exit
194void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
195{ 199{
196 if (cmd_pid) 200 if (cmd_pid)
197 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
198 202
203 pty_ev.stop ();
199 delete pty; pty = 0; 204 delete pty; pty = 0;
200} 205}
201 206
202rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
203{ 208{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 209 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 210
208 emergency_cleanup (); 211 emergency_cleanup ();
209 212
210#if ENABLE_STYLES 213#if ENABLE_STYLES
… …
214#endif 217#endif
215 delete fontset[0]; 218 delete fontset[0];
216 219
217 if (display) 220 if (display)
218 { 221 {
219 dDisp;
220
221 selection_clear (); 222 selection_clear ();
222 223
223#ifdef USE_XIM 224#ifdef USE_XIM
224 im_destroy (); 225 im_destroy ();
225#endif 226#endif
226#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 230#endif
230#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 233#endif
233#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 245#endif
245#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 250#endif
250 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
251 252
252 delete drawable; 253 delete drawable;
253 // destroy all windows 254 // destroy all windows
254 if (parent[0]) 255 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
256 }
257 257
258 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
266
267 clear ();
268 }
269
259 delete pix_colors_focused; 270 delete pix_colors_focused;
260#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
261 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
262#endif 273#endif
263 274
… …
269 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 281 free (allocated [i]);
271 282
272 free (selection.text); 283 free (selection.text);
273 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 285 free (env_display);
276 free (env_term); 286 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 287 free (locale);
279 free (v_buffer); 288 free (v_buffer);
280 free (incr_buf); 289 free (incr_buf);
281 290
282 delete envv; 291 delete envv;
… …
285#ifdef KEYSYM_RESOURCE 294#ifdef KEYSYM_RESOURCE
286 delete keyboard; 295 delete keyboard;
287#endif 296#endif
288} 297}
289 298
299// child has exited, usually destroys
290void 300void
291rxvt_term::child_exit () 301rxvt_term::child_cb (child_watcher &w, int status)
292{ 302{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304
293 cmd_pid = 0; 305 cmd_pid = 0;
294 306
295 if (!OPTION (Opt_hold)) 307 if (!OPTION (Opt_hold))
296 destroy (); 308 destroy ();
297} 309}
… …
299void 311void
300rxvt_term::destroy () 312rxvt_term::destroy ()
301{ 313{
302 if (destroy_ev.active) 314 if (destroy_ev.active)
303 return; 315 return;
316
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
304 318
305#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
306 scr_overlay_off (); 320 scr_overlay_off ();
307#endif 321#endif
308 322
… …
363{ 377{
364 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
366} 380}
367 381
368#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
369static void 383static void
370print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
371{ 385{
372 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
373 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
421 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
422 else 436 else
423 { 437 {
424 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
425 // so just output the error and continue 439 // so just output the error and continue
426#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
427 print_x_error (display, event); 443 print_x_error (display, event);
428#else
429 old_xerror_handler (display, event);
430#endif 444#endif
431 } 445 }
432 446
433 return 0; 447 return 0;
434} 448}
… …
442 _exit (EXIT_FAILURE); 456 _exit (EXIT_FAILURE);
443} 457}
444 458
445/*----------------------------------------------------------------------*/ 459/*----------------------------------------------------------------------*/
446bool 460bool
447rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 462{
463 this->envv = envv;
464
449 SET_R (this); 465 SET_R (this);
450 set_locale (""); 466 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 467 set_environ (envv); // few things in X do not call setlocale :(
452 468
453 if (!init_vars ()) 469 if (!init_vars ())
… …
464#ifdef HAVE_SCROLLBARS 480#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 481 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 483#endif
468 484
469#if ENABLE_PERL 485 pty = ptytty::create ();
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483 486
484 create_windows (argc, argv); 487 create_windows (argc, argv);
485 488
486 dDisp;
487
488 init_xlocale (); 489 init_xlocale ();
489 490
490 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
491 492
492#if 0 493#if 0
493 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
494#endif 495#endif
495 496
496#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
499#endif 500#endif
500#ifdef TRANSPARENT 501#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
502 { 503 {
503 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 505 check_our_parents ();
505 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
506 } 507 }
507#endif 508#endif
508 509
509 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]);
511
512 set_colorfgbg (); 510 set_colorfgbg ();
513 511
514 init_command (cmd_argv); 512 init_command (cmd_argv);
515 513
516 free (cmd_argv); 514 free (cmd_argv);
… …
520 518
521 check_ev.start (); 519 check_ev.start ();
522 520
523 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
524 522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
533 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]);
535
525 return true; 536 return true;
526} 537}
527 538
528static struct sig_handlers 539static struct sig_handlers
529{ 540{
530 sig_watcher sw_chld, sw_term, sw_int; 541 sig_watcher sw_term, sw_int;
531 542
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545
546 /* 543 /*
547 * Catch a fatal signal and tidy up before quitting 544 * Catch a fatal signal and tidy up before quitting
548 */ 545 */
549 void 546 void
550 sig_term (sig_watcher &w) 547 sig_term (sig_watcher &w)
551 { 548 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 549 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 550 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 551 kill (getpid (), w.signum);
558 } 552 }
559 553
560 sig_handlers () 554 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 555 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 556 sw_int (this, &sig_handlers::sig_term)
564 { 557 {
565 } 558 }
566} sig_handlers; 559} sig_handlers;
567 560
568char **rxvt_environ; // startup environment 561char **rxvt_environ; // startup environment
569 562
570void 563void
571rxvt_init () 564rxvt_init ()
572{ 565{
573 uid_t uid = getuid (); 566 ptytty::init ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || 1 //D
580 || gid != getegid ())
581 {
582#if PTYTTY_HELPER
583 rxvt_ptytty_server ();
584#else
585 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
586#endif
587
588 // drop privileges
589#if HAVE_SETRESUID
590 setresgid (gid, gid, gid);
591 setresuid (uid, uid, uid);
592#elif HAVE_SETREUID
593 setregid (gid, gid);
594 setreuid (uid, uid);
595#elif HAVE_SETUID
596 setgid (gid);
597 setuid (uid);
598#endif
599
600 if (uid != geteuid ()
601 || gid != getegid ())
602 rxvt_fatal ("unable to drop privileges, aborting.\n");
603 }
604 567
605 rxvt_environ = environ; 568 rxvt_environ = environ;
606 569
607 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
608 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
609 572
610 sig_handlers.sw_chld.start (SIGCHLD);
611 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM);
612 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT);
613 575
614 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
615 /* signal (SIGURG, SIG_DFL); */ 577 /* signal (SIGURG, SIG_DFL); */
… …
644 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
645 607
646 return p; 608 return p;
647} 609}
648 610
649void * 611void *
650rxvt_realloc (void *ptr, size_t size) 612rxvt_realloc (void *ptr, size_t size)
651{ 613{
652 void *p = realloc (ptr, size); 614 void *p = realloc (ptr, size);
653 615
654 if (!p) 616 if (!p)
… …
667{ 629{
668 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
669 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
670 unsigned int w, h; 632 unsigned int w, h;
671 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
672 dDisp;
673
674 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
675 ncol, nrow, szHint.width, szHint.height));
676 634
677 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
678 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
679 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
680 638
… …
742 700
743 if (scrollBar.state) 701 if (scrollBar.state)
744 { 702 {
745 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
746 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
747 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
748 window_vt_x += sb_w; 707 window_vt_x += sb_w;
749 } 708 }
750 709
751 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
752 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
753 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
754 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
755 714
756 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
757 { 716 {
758 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
777 736
778 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
779 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
780 739
781 if (recalc_x) 740 if (recalc_x)
782 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
783 if (recalc_y) 743 if (recalc_y)
784 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
785 745
786 ncol = width / fwidth; 746 ncol = width / fwidth;
787 nrow = height / fheight; 747 nrow = height / fheight;
788 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
789 ncol, nrow, szHint.width,
790 szHint.height));
791 return;
792} 748}
793 749
794/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
795/* 751/*
796 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
… …
896 return true; 852 return true;
897} 853}
898 854
899void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
900{ 856{
901 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
902 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
903 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
904} 860}
905 861
906void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
907{ 863{
908 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
909 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
910 866
911 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
913 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
914 870
915 free (s); 871 free (s);
916 free (ws); 872 free (ws);
… …
941void 897void
942rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
943{ 899{
944 rxvt_color xcol; 900 rxvt_color xcol;
945 int i; 901 int i;
946 902
947 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
948 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
949 909
950 /* handle color aliases */ 910 /* handle color aliases */
951 if (isdigit (*color)) 911 if (isdigit (*color))
952 { 912 {
953 i = atoi (color); 913 i = atoi (color);
954 914
955 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
956 { /* bright colors */ 916 { /* bright colors */
957 i -= 8; 917 i -= 8;
958 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
959 SET_PIXCOLOR (idx);
960 goto done; 919 goto done;
961 } 920 }
962 921
963 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
964 { /* normal colors */ 923 { /* normal colors */
965 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
966 SET_PIXCOLOR (idx);
967 goto done; 925 goto done;
968 } 926 }
969 } 927 }
970 928
971 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
972 return;
973
974 /* XStoreColor (display->display, display->cmap, XColor*); */
975 930
976 /* 931 /*
977 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
978 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
979 */ 934 */
980# if 0
981 for (i = Color_Black; i <= Color_White; i++)
982 if (pix_colors[idx] == pix_colors[i])
983 break;
984 if (i > Color_White)
985 {
986 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
987 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
988 DisplayPlanes (display->display, display->screen));
989 }
990# endif
991 935
992 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
993 SET_PIXCOLOR (idx);
994 937
995 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
996 /* Cursor cursor; */ 939 /* Cursor cursor; */
997done: 940done:
998
999#if OFF_FOCUS_FADING
1000 if (rs[Rs_fade])
1001 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1002#endif
1003
1004 /*TODO: handle Color_BD, scrollbar background, etc. */ 941 /*TODO: handle Color_BD, scrollbar background, etc. */
1005 942
943 update_fade_color (idx);
1006 recolour_cursor (); 944 recolour_cursor ();
1007 scr_recolour (); 945 scr_recolour ();
1008} 946}
1009 947
1010#else 948#else
… …
1012#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
1013 951
1014void 952void
1015rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
1016{ 954{
1017 XColor xcol[2]; 955 XColor fg, bg;
1018 956
1019 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
1020 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
1021 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
1022 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
1023 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
1024 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
1025 964
1026 XQueryColors (display->display, display->cmap, xcol, 2); 965 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1027 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1028} 966}
1029 967
1030/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
1031/* 969/*
1032 * find if fg/bg matches any of the normal (low-intensity) colors 970 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1036{ 974{
1037 unsigned int i; 975 unsigned int i;
1038 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040 978
1041 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1042 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
1043 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
1044 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
1046 { 983 {
… …
1061 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1062} 999}
1063 1000
1064/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1065 1002
1066int 1003bool
1067rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1068{ 1005{
1069 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1070 {
1071 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1072 return false;
1073 }
1074
1075 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1011}
1012
1013void
1014rxvt_term::alias_color (int dst, int src)
1015{
1016 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1076} 1017}
1077 1018
1078/* -------------------------------------------------------------------- * 1019/* -------------------------------------------------------------------- *
1079 * - WINDOW RESIZING - * 1020 * - WINDOW RESIZING - *
1080 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
1081void 1022void
1082rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1083{ 1024{
1084 int fix_screen; 1025 int fix_screen;
1085 int old_width = szHint.width, old_height = szHint.height; 1026 int old_width = szHint.width;
1086 dDisp; 1027 int old_height = szHint.height;
1087 1028
1088 window_calc (newwidth, newheight); 1029 window_calc (newwidth, newheight);
1030
1031 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1089 XSetWMNormalHints (disp, parent[0], &szHint); 1032 XSetWMNormalHints (dpy, parent[0], &szHint);
1090 1033
1091 if (!ignoreparent) 1034 if (!ignoreparent)
1092 { 1035 {
1093#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1094 /* 1037 /*
… …
1098 int x, y, x1, y1; 1041 int x, y, x1, y1;
1099 int dx, dy; 1042 int dx, dy;
1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1101 Window unused_cr; 1044 Window unused_cr;
1102 1045
1103 XTranslateCoordinates (disp, parent[0], display->root, 1046 XTranslateCoordinates (dpy, parent[0], display->root,
1104 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1105 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1107 /* 1050 /*
1108 * if display->root isn't the parent window, a WM will probably have offset 1051 * if display->root isn't the parent window, a WM will probably have offset
1109 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1110 */ 1053 */
… …
1112 { 1055 {
1113 x -= x1; 1056 x -= x1;
1114 y -= y1; 1057 y -= y1;
1115 } 1058 }
1116 1059
1117 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1060 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1118 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1119 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1120 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1121 1064
1122 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1123 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
1124 dx = 0; 1067 dx = 0;
… …
1127 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1128 dy = 0; 1071 dy = 0;
1129 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1130 dy /= 2; 1073 dy /= 2;
1131 1074
1132 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1133 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1134#else 1077#else
1135 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1136#endif 1079#endif
1137 } 1080 }
1138 1081
1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1140 1083
1141 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1142 { 1085 {
1143 if (scrollBar.state) 1086 if (scrollBar.state)
1144 { 1087 {
1145 XMoveResizeWindow (disp, scrollBar.win, 1088 XMoveResizeWindow (dpy, scrollBar.win,
1146 window_sb_x, 0, 1089 window_sb_x, 0,
1147 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1148 resize_scrollbar (); 1091 resize_scrollbar ();
1149 } 1092 }
1150 1093
1151 XMoveResizeWindow (disp, vt, 1094 XMoveResizeWindow (dpy, vt,
1152 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1153 width, height); 1096 width, height);
1154 1097
1155 scr_clear (); 1098 scr_clear ();
1156#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1157 resize_pixmap (); 1100 resize_pixmap ();
1158#endif 1101#endif
1159 } 1102 }
1160 1103
1161 if (fix_screen || old_height == 0) 1104 if (fix_screen || old_height == 0)
1162 {
1163 int curr_screen = -1;
1164 int old_ncol = prev_ncol;
1165
1166 /* scr_reset only works on the primary screen */
1167 if (old_height) /* this is not the first time through */
1168 {
1169 unsigned int ocol = ncol;
1170 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1171 curr_screen = scr_change_screen (PRIMARY);
1172 ncol = ocol;
1173 }
1174
1175 scr_reset (); 1105 scr_reset ();
1176 1106
1177 if (curr_screen >= 0) /* this is not the first time through */ 1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1178 { 1108 //scr_touch (false);
1179 scr_change_screen (curr_screen);
1180 selection_check (old_ncol != ncol ? 4 : 0);
1181 }
1182 }
1183
1184 old_width = szHint.width;
1185 old_height = szHint.height;
1186 1109
1187#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
1188 if (pixmap) 1111 if (pixmap)
1189 scr_touch (false); 1112 scr_touch (false);
1190#endif 1113#endif
1191 1114
1192#ifdef USE_XIM 1115#ifdef USE_XIM
1193 IMSetStatusPosition (); 1116 IMSetPosition ();
1194#endif 1117#endif
1195} 1118}
1196 1119
1197/* 1120/*
1198 * Set the width/height of the vt window in characters. Units are pixels. 1121 * Set the width/height of the vt window in characters. Units are pixels.
… …
1203{ 1126{
1204 XWindowAttributes wattr; 1127 XWindowAttributes wattr;
1205 1128
1206 if (newwidth == 0 || newheight == 0) 1129 if (newwidth == 0 || newheight == 0)
1207 { 1130 {
1208 XGetWindowAttributes (display->display, display->root, &wattr); 1131 XGetWindowAttributes (dpy, display->root, &wattr);
1209 1132
1210 if (newwidth == 0) 1133 if (newwidth == 0)
1211 newwidth = wattr.width - szHint.base_width; 1134 newwidth = wattr.width - szHint.base_width;
1212 if (newheight == 0) 1135 if (newheight == 0)
1213 newheight = wattr.height - szHint.base_height; 1136 newheight = wattr.height - szHint.base_height;
… …
1227#ifdef USE_XIM 1150#ifdef USE_XIM
1228 1151
1229void 1152void
1230rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1153rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1231{ 1154{
1232 fg = pix_colors[Color_fg]; 1155 fg = pix_colors [Color_fg];
1233 bg = pix_colors[Color_bg]; 1156 bg = pix_colors [Color_bg];
1234} 1157}
1235 1158
1236void 1159void
1237rxvt_term::im_set_size (XRectangle &size) 1160rxvt_term::im_set_size (XRectangle &size)
1238{ 1161{
… …
1275 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1198 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1276 1199
1277 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1200 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1278 *p = '\0'; 1201 *p = '\0';
1279 1202
1280 atom = XInternAtom (display->display, server, False); 1203 atom = XInternAtom (dpy, server, False);
1281 win = XGetSelectionOwner (display->display, atom); 1204 win = XGetSelectionOwner (dpy, atom);
1282 1205
1283 if (win != None) 1206 if (win != None)
1284 return True; 1207 return True;
1285 } 1208 }
1286 1209
… …
1293 XPoint nspot; 1216 XPoint nspot;
1294 XVaNestedList preedit_attr; 1217 XVaNestedList preedit_attr;
1295 1218
1296 if (!Input_Context 1219 if (!Input_Context
1297 || !focus 1220 || !focus
1298 || !(input_style & XIMPreeditPosition)) 1221 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1299 return; 1222 return;
1300 1223
1301 im_set_position (nspot); 1224 im_set_position (nspot);
1302 1225
1303 if (nspot.x == spot.x && nspot.y == spot.y) 1226 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1322 input_method = 0; 1245 input_method = 0;
1323 } 1246 }
1324 1247
1325 Input_Context = 0; 1248 Input_Context = 0;
1326} 1249}
1250
1251#ifdef ENABLE_XIM_ONTHESPOT
1252
1253static void
1254xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1255{
1256 ((rxvt_term *)client_data)->make_current ();
1257 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1258}
1259
1260static void
1261xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1262{
1263 ((rxvt_term *)client_data)->make_current ();
1264 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1265}
1266
1267static void
1268xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1269{
1270 rxvt_term *term = (rxvt_term *)client_data;
1271 XIMText *text = call_data->text;
1272
1273 term->make_current ();
1274
1275 if (text)
1276 {
1277 void *str;
1278
1279 if (!text->encoding_is_wchar && text->string.multi_byte)
1280 {
1281 // of course, X makes it ugly again
1282 if (term->rs[Rs_imLocale])
1283 SET_LOCALE (term->rs[Rs_imLocale]);
1284
1285 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1286 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1287
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->locale);
1290 }
1291 else
1292 str = (void *)text->string.wide_char;
1293
1294 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1295 DT_INT, call_data->caret,
1296 DT_INT, call_data->chg_first,
1297 DT_INT, call_data->chg_length,
1298 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1299 DT_WCS_LEN, str, str ? (int)text->length : 0,
1300 DT_END));
1301 }
1302 else
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_END));
1308}
1309
1310#if 0
1311static void
1312xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1313{
1314 ((rxvt_term *)client_data)->make_current ();
1315 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1316 DT_INT, call_data->position,
1317 DT_INT, call_data->direction,
1318 DT_INT, call_data->style,
1319 DT_END));
1320}
1321#endif
1322
1323#endif
1327 1324
1328/* 1325/*
1329 * Try to open a XIM with the current modifiers, then see if we can 1326 * Try to open a XIM with the current modifiers, then see if we can
1330 * open a suitable preedit type 1327 * open a suitable preedit type
1331 */ 1328 */
… …
1338 XRectangle rect, status_rect, needed_rect; 1335 XRectangle rect, status_rect, needed_rect;
1339 unsigned long fg, bg; 1336 unsigned long fg, bg;
1340 const char *p; 1337 const char *p;
1341 char **s; 1338 char **s;
1342 XIMStyles *xim_styles; 1339 XIMStyles *xim_styles;
1340#ifdef ENABLE_XIM_ONTHESPOT
1341 XIMCallback xcb[4];
1342#endif
1343 1343
1344 set_environ (envv); 1344 set_environ (envv);
1345 1345
1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1347 return false; 1347 return false;
1348 1348
1349 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1350 input_method = display->get_xim (locale, modifiers); 1349 input_method = display->get_xim (locale, modifiers);
1351 if (input_method == NULL) 1350 if (input_method == NULL)
1352 return false; 1351 return false;
1353 1352
1354 xim = input_method->xim; 1353 xim = input_method->xim;
… …
1374 s = rxvt_splitcommastring (p); 1373 s = rxvt_splitcommastring (p);
1375 1374
1376 for (i = found = 0; !found && s[i]; i++) 1375 for (i = found = 0; !found && s[i]; i++)
1377 { 1376 {
1378 if (!strcmp (s[i], "OverTheSpot")) 1377 if (!strcmp (s[i], "OverTheSpot"))
1379 input_style = (XIMPreeditPosition | XIMStatusNothing); 1378 input_style = XIMPreeditPosition | XIMStatusNothing;
1380 else if (!strcmp (s[i], "OffTheSpot")) 1379 else if (!strcmp (s[i], "OffTheSpot"))
1381 input_style = (XIMPreeditArea | XIMStatusArea); 1380 input_style = XIMPreeditArea | XIMStatusArea;
1382 else if (!strcmp (s[i], "Root")) 1381 else if (!strcmp (s[i], "Root"))
1383 input_style = (XIMPreeditNothing | XIMStatusNothing); 1382 input_style = XIMPreeditNothing | XIMStatusNothing;
1384 else if (!strcmp (s[i], "None")) 1383 else if (!strcmp (s[i], "None"))
1385 input_style = (XIMPreeditNone | XIMStatusNone); 1384 input_style = XIMPreeditNone | XIMStatusNone;
1385#ifdef ENABLE_XIM_ONTHESPOT
1386 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1387 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1388#endif
1389 else
1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1386 1391
1387 for (j = 0; j < xim_styles->count_styles; j++) 1392 for (j = 0; j < xim_styles->count_styles; j++)
1388 if (input_style == xim_styles->supported_styles[j]) 1393 if (input_style == xim_styles->supported_styles[j])
1389 { 1394 {
1390 rxvt_freecommastring (s); 1395 rxvt_freecommastring (s);
… …
1428 "*", 1433 "*",
1429 fheight, 1434 fheight,
1430 fheight + 1, fheight - 1, 1435 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1436 fheight - 2, fheight + 2);
1432 1437
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1438 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1439 &missing_charset_list, &missing_charset_count, &def_string);
1435 1440
1436 if (missing_charset_list) 1441 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1442 XFreeStringList (missing_charset_list);
1438 1443
… …
1479 XNBackground, bg, 1484 XNBackground, bg,
1480 XNArea, &status_rect, 1485 XNArea, &status_rect,
1481 XNFontSet, fs, 1486 XNFontSet, fs,
1482 NULL); 1487 NULL);
1483 } 1488 }
1489#if ENABLE_XIM_ONTHESPOT
1490 else if (input_style & XIMPreeditCallbacks)
1491 {
1492 im_set_position (spot);
1493
1494 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1495 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1496 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1497# if 0
1498 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1499# endif
1500
1501 preedit_attr = XVaCreateNestedList (0,
1502 XNSpotLocation, &spot,
1503 XNPreeditStartCallback, &xcb[0],
1504 XNPreeditDoneCallback , &xcb[1],
1505 XNPreeditDrawCallback , &xcb[2],
1506# if 0
1507 XNPreeditCaretCallback, &xcb[3],
1508# endif
1509 NULL);
1510 }
1511#endif
1484 1512
1485 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1486 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1487 XNClientWindow, vt, 1515 XNClientWindow, vt,
1488 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1490 preedit_attr, 1518 preedit_attr,
1491 status_attr ? XNStatusAttributes : NULL, 1519 status_attr ? XNStatusAttributes : NULL,
1492 status_attr, NULL); 1520 status_attr, NULL);
1493 1521
1494 if (preedit_attr) XFree (preedit_attr); 1522 if (preedit_attr) XFree (preedit_attr);
1495 if (status_attr) XFree (status_attr); 1523 if (status_attr) XFree (status_attr);
1496 if (fs) XFreeFontSet (display->display, fs); 1524 if (fs) XFreeFontSet (dpy, fs);
1497 1525
1498 if (Input_Context == NULL) 1526 if (Input_Context == NULL)
1499 { 1527 {
1500 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1501 im_destroy (); 1529 im_destroy ();
1502 return false; 1530 return false;
1503 } 1531 }
1504 1532
1505 if (input_style & XIMPreeditArea) 1533#if 0
1534 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input ();
1537#endif
1538
1506 IMSetStatusPosition (); 1539 IMSetPosition ();
1507 1540
1508 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1509 return true; 1541 return true;
1510} 1542}
1511 1543
1512void 1544void
1513rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1519 1551
1520 make_current (); 1552 make_current ();
1521 1553
1522 im_destroy (); 1554 im_destroy ();
1523 1555
1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1525 if (Input_Context) 1556 if (Input_Context)
1526 return; 1557 return;
1527 1558
1528#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1529 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1571 SET_LOCALE (locale); 1602 SET_LOCALE (locale);
1572#endif 1603#endif
1573} 1604}
1574 1605
1575void 1606void
1576rxvt_term::IMSetStatusPosition () 1607rxvt_term::IMSetPosition ()
1577{ 1608{
1578 XRectangle preedit_rect, status_rect, *needed_rect; 1609 XRectangle preedit_rect, status_rect, *needed_rect;
1579 XVaNestedList preedit_attr, status_attr; 1610 XVaNestedList preedit_attr, status_attr;
1580 1611
1581 if (!Input_Context 1612 if (!Input_Context
1582 || !focus 1613 || !focus
1583 || !(input_style & XIMPreeditArea) 1614 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1584 || !IMisRunning ()) 1615 || !IMisRunning ())
1585 return; 1616 return;
1586 1617
1618 if (input_style & XIMPreeditPosition)
1619 {
1620 im_set_size (preedit_rect);
1621 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1622
1623 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, NULL);
1625 }
1626 else
1627 {
1587 /* Getting the necessary width of preedit area */ 1628 /* Getting the necessary width of preedit area */
1588 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1629 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1589 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1630 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1590 XFree (status_attr); 1631 XFree (status_attr);
1591 1632
1592 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1633 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1593 XFree (needed_rect); 1634 XFree (needed_rect);
1594 1635
1595 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1596 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1597 1638
1598 XSetICValues (Input_Context, 1639 XSetICValues (Input_Context,
1599 XNPreeditAttributes, preedit_attr, 1640 XNPreeditAttributes, preedit_attr,
1600 XNStatusAttributes, status_attr, NULL); 1641 XNStatusAttributes, status_attr,
1642 NULL);
1601 1643
1644 XFree (status_attr);
1645 }
1646
1602 XFree (preedit_attr); 1647 XFree (preedit_attr);
1603 XFree (status_attr);
1604} 1648}
1605#endif /* USE_XIM */ 1649#endif /* USE_XIM */
1606 1650
1607/*----------------------------------------------------------------------*/
1608rxvt_t rxvt_current_term;
1609
1610/*----------------------- end-of-file (C source) -----------------------*/ 1651/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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