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.180 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.216 by root, Wed Feb 1 21:15:33 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
73 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
74 return false; 62 return false;
75 63
76 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
78 return true; 66 return true;
79} 67}
80 68
81void 69void
82rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
83{ 71{
84 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
86} 74}
87 75
88void 76void
89rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
90{ 78{
91 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
92} 80}
93 81
94#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 171#endif
184#ifdef USE_XIM 172#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
186#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
187 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
196 188
197 termlist.push_back (this); 189 termlist.push_back (this);
198 190
199#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 193#endif
205} 194}
206 195
207// 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.
208// for use before an emergency exit 197// for use before an emergency exit
209void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
210{ 199{
211 if (cmd_pid) 200 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
213 202
214#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
215 privileged_utmp (RESTORE);
216#endif
217
218 pty.put ();
219} 204}
220 205
221rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
222{ 207{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 209
227 emergency_cleanup (); 210 emergency_cleanup ();
228 211
229#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
233#endif 216#endif
234 delete fontset[0]; 217 delete fontset[0];
235 218
236 if (display) 219 if (display)
237 { 220 {
238 dDisp;
239
240 selection_clear (); 221 selection_clear ();
241 222
242#ifdef USE_XIM 223#ifdef USE_XIM
243 im_destroy (); 224 im_destroy ();
244#endif 225#endif
245#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
248#endif 229#endif
249#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
251#endif 232#endif
252#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
263#endif 244#endif
264#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
268#endif 249#endif
269 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
270 251
271 delete drawable; 252 delete drawable;
272 // destroy all windows 253 // destroy all windows
273 if (parent[0]) 254 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
275 }
276 256
277 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
278 delete pix_colors_focused; 269 delete pix_colors_focused;
279#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
281#endif 272#endif
282 273
… …
288 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 280 free (allocated [i]);
290 281
291 free (selection.text); 282 free (selection.text);
292 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 284 free (env_display);
295 free (env_term); 285 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 286 free (locale);
298 free (v_buffer); 287 free (v_buffer);
299 free (incr_buf); 288 free (incr_buf);
300 289
301 delete envv; 290 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
305 delete keyboard; 294 delete keyboard;
306#endif 295#endif
307} 296}
308 297
298// child has exited, usually destroys
309void 299void
310rxvt_term::child_exit () 300rxvt_term::child_cb (child_watcher &w, int status)
311{ 301{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303
312 cmd_pid = 0; 304 cmd_pid = 0;
313 305
314 if (!OPTION (Opt_hold)) 306 if (!OPTION (Opt_hold))
315 destroy (); 307 destroy ();
316} 308}
… …
318void 310void
319rxvt_term::destroy () 311rxvt_term::destroy ()
320{ 312{
321 if (destroy_ev.active) 313 if (destroy_ev.active)
322 return; 314 return;
315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 317
324#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
325 scr_overlay_off (); 319 scr_overlay_off ();
326#endif 320#endif
327 321
… …
382{ 376{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
385} 379}
386 380
387#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
388static void 382static void
389print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
390{ 384{
391 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
441 else 435 else
442 { 436 {
443 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 438 // so just output the error and continue
445#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
446 print_x_error (display, event); 442 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 443#endif
450 } 444 }
451 445
452 return 0; 446 return 0;
453} 447}
… …
461 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
462} 456}
463 457
464/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
465bool 459bool
466rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 461{
462 this->envv = envv;
463
468 SET_R (this); 464 SET_R (this);
469 set_locale (""); 465 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 466 set_environ (envv); // few things in X do not call setlocale :(
471 467
472 if (!init_vars ()) 468 if (!init_vars ())
… …
483#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 482#endif
487 483
488#if ENABLE_PERL 484 pty = ptytty::create ();
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513 485
514 create_windows (argc, argv); 486 create_windows (argc, argv);
515 487
516 dDisp;
517
518 init_xlocale (); 488 init_xlocale ();
519 489
520 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
521 491
522#if 0 492#if 0
523 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
524#endif 494#endif
525 495
526#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
527 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
528 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
529#endif 499#endif
530#ifdef TRANSPARENT 500#ifdef TRANSPARENT
531 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
532 { 502 {
533 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
534 check_our_parents (); 504 check_our_parents ();
535 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
536 } 506 }
537#endif 507#endif
538 508
539 XMapWindow (disp, vt);
540 XMapWindow (disp, parent[0]);
541
542 set_colorfgbg (); 509 set_colorfgbg ();
543 510
544 init_command (cmd_argv); 511 init_command (cmd_argv);
545 512
546 free (cmd_argv); 513 free (cmd_argv);
547 514
548 if (pty.pty >= 0) 515 if (pty->pty >= 0)
549 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty->pty, EVENT_READ);
550 517
551 check_ev.start (); 518 check_ev.start ();
552 519
553 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
554 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (xdisp, vt);
533 XMapWindow (xdisp, parent[0]);
534
555 return true; 535 return true;
556} 536}
557 537
558static struct sig_handlers 538static struct sig_handlers
559{ 539{
560 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
561 541
562 void sig_chld (sig_watcher &w)
563 {
564 // we are being called for every SIGCHLD, find the corresponding term
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->child_exit ();
572 break;
573 }
574 }
575
576 /* 542 /*
577 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
578 */ 544 */
579 void 545 void
580 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
581 { 547 {
582#ifdef DEBUG_CMD
583 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584#endif
585 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
586 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
588 } 551 }
589 552
590 sig_handlers () 553 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
594 { 556 {
595 } 557 }
596} sig_handlers; 558} sig_handlers;
597 559
598char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
599 561
600void 562void
601rxvt_init () 563rxvt_init ()
602{ 564{
565 ptytty::init ();
566
603 rxvt_environ = environ; 567 rxvt_environ = environ;
604
605 /*
606 * Save and then give up any super-user privileges
607 * If we need privileges in any area then we must specifically request it.
608 * We should only need to be root in these cases:
609 * 1. write utmp entries on some systems
610 * 2. chown tty on some systems
611 */
612 rxvt_privileges (SAVE);
613 rxvt_privileges (IGNORE);
614 568
615 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
616 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
617 571
618 sig_handlers.sw_chld.start (SIGCHLD);
619 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
620 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
621 574
622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
623 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
… …
652 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
653 606
654 return p; 607 return p;
655} 608}
656 609
657void * 610void *
658rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
659{ 612{
660 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
661 614
662 if (!p) 615 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
664 617
665 return p; 618 return p;
666} 619}
667
668/* ------------------------------------------------------------------------- *
669 * PRIVILEGED OPERATIONS *
670 * ------------------------------------------------------------------------- */
671/* take care of suid/sgid super-user (root) privileges */
672void
673rxvt_privileges (rxvt_privaction action)
674{
675#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 setegid (getgid ());
691 seteuid (getuid ());
692 break;
693 case SAVE:
694 saved_egid = getegid ();
695 saved_euid = geteuid ();
696 break;
697 case RESTORE:
698 setegid (saved_egid);
699 seteuid (saved_euid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setgid (getgid ());
707 setuid (getuid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 makeutent (pty.name, rs[Rs_display_name]);
730 else
731 cleanutent ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736 620
737/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
738/* 622/*
739 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 624 * if width/height are non-zero then override calculated width/height
… …
744{ 628{
745 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
746 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
747 unsigned int w, h; 631 unsigned int w, h;
748 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
749 dDisp;
750
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752 ncol, nrow, szHint.width, szHint.height));
753 633
754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
755 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757 637
… …
819 699
820 if (scrollBar.state) 700 if (scrollBar.state)
821 { 701 {
822 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
824 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 706 window_vt_x += sb_w;
826 } 707 }
827 708
828 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
… …
854 735
855 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
857 738
858 if (recalc_x) 739 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
860 if (recalc_y) 742 if (recalc_y)
861 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
862 744
863 ncol = width / fwidth; 745 ncol = width / fwidth;
864 nrow = height / fheight; 746 nrow = height / fheight;
865 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866 ncol, nrow, szHint.width,
867 szHint.height));
868 return;
869} 747}
870 748
871/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
872/* 750/*
873 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
874 * Called after a window size change. 752 * Called after a window size change.
875 */ 753 */
876void 754void
877rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
878{ 756{
879 if (pty.pty < 0) 757 if (pty->pty < 0)
880 return; 758 return;
881 759
882 struct winsize ws; 760 struct winsize ws;
883 761
884 ws.ws_col = ncol; 762 ws.ws_col = ncol;
885 ws.ws_row = nrow; 763 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 764 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 765 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 767
890#if 0 768#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 771 kill (-cmd_pid, SIGWINCH);
… …
973 return true; 851 return true;
974} 852}
975 853
976void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
977{ 855{
978 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
979 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
980 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
981} 859}
982 860
983void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
984{ 862{
985 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
986 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
987 865
988 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
989 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
990 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
991 869
992 free (s); 870 free (s);
993 free (ws); 871 free (ws);
… …
1018void 896void
1019rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
1020{ 898{
1021 rxvt_color xcol; 899 rxvt_color xcol;
1022 int i; 900 int i;
1023 901
1024 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
1025 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
1026 908
1027 /* handle color aliases */ 909 /* handle color aliases */
1028 if (isdigit (*color)) 910 if (isdigit (*color))
1029 { 911 {
1030 i = atoi (color); 912 i = atoi (color);
1031 913
1032 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
1033 { /* bright colors */ 915 { /* bright colors */
1034 i -= 8; 916 i -= 8;
1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1036 SET_PIXCOLOR (idx);
1037 goto done; 918 goto done;
1038 } 919 }
1039 920
1040 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1041 { /* normal colors */ 922 { /* normal colors */
1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1043 SET_PIXCOLOR (idx);
1044 goto done; 924 goto done;
1045 } 925 }
1046 } 926 }
1047 927
1048 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1049 return;
1050
1051 /* XStoreColor (display->display, display->cmap, XColor*); */
1052 929
1053 /* 930 /*
1054 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
1055 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1056 */ 933 */
1057# if 0
1058 for (i = Color_Black; i <= Color_White; i++)
1059 if (pix_colors[idx] == pix_colors[i])
1060 break;
1061 if (i > Color_White)
1062 {
1063 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1064 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1065 DisplayPlanes (display->display, display->screen));
1066 }
1067# endif
1068 934
1069 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1070 SET_PIXCOLOR (idx);
1071 936
1072 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1073 /* Cursor cursor; */ 938 /* Cursor cursor; */
1074done: 939done:
1075 940
1076#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1077 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1078 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
1079#endif 948#endif
1080 949
1081 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1082 951
1083 recolour_cursor (); 952 recolour_cursor ();
… …
1089#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1090 959
1091void 960void
1092rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1093{ 962{
1094 XColor xcol[2]; 963 XColor fg, bg;
1095 964
1096 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1097 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1098 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1099 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1100 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1101 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1102 972
1103 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1104 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1105} 974}
1106 975
1107/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1108/* 977/*
1109 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1113{ 982{
1114 unsigned int i; 983 unsigned int i;
1115 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1116 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1117 986
1118 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1119 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1120 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1121 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1122 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1123 { 991 {
… …
1138 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1139} 1007}
1140 1008
1141/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1142 1010
1143int 1011bool
1144rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1145{ 1013{
1146 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1147 {
1148 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1149 return false;
1150 }
1151
1152 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1153} 1025}
1154 1026
1155/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1156 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1157 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1158void 1030void
1159rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1160{ 1032{
1161 int fix_screen; 1033 int fix_screen;
1162 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1163 dDisp; 1035 int old_height = szHint.height;
1164 1036
1165 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1166 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1167 1039
1168 if (!ignoreparent) 1040 if (!ignoreparent)
1169 { 1041 {
1170#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1171 /* 1043 /*
… …
1175 int x, y, x1, y1; 1047 int x, y, x1, y1;
1176 int dx, dy; 1048 int dx, dy;
1177 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1178 Window unused_cr; 1050 Window unused_cr;
1179 1051
1180 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1181 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1182 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1183 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1184 /* 1056 /*
1185 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1186 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1187 */ 1059 */
… …
1189 { 1061 {
1190 x -= x1; 1062 x -= x1;
1191 y -= y1; 1063 y -= y1;
1192 } 1064 }
1193 1065
1194 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1195 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1196 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1197 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1198 1070
1199 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1200 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1201 dx = 0; 1073 dx = 0;
… …
1204 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1205 dy = 0; 1077 dy = 0;
1206 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1207 dy /= 2; 1079 dy /= 2;
1208 1080
1209 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1210 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1211#else 1083#else
1212 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1213#endif 1085#endif
1214 } 1086 }
1215 1087
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1089
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1091 {
1220 if (scrollBar.state) 1092 if (scrollBar.state)
1221 { 1093 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1223 window_sb_x, 0, 1095 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1097 resize_scrollbar ();
1226 } 1098 }
1227 1099
1228 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1229 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1230 width, height); 1102 width, height);
1231 1103
1232 scr_clear (); 1104 scr_clear ();
1233#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1234 resize_pixmap (); 1106 resize_pixmap ();
1235#endif 1107#endif
1236 } 1108 }
1237 1109
1238 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1239 {
1240 int curr_screen = -1;
1241 int old_ncol = prev_ncol;
1242
1243 /* scr_reset only works on the primary screen */
1244 if (old_height) /* this is not the first time through */
1245 {
1246 unsigned int ocol = ncol;
1247 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1248 curr_screen = scr_change_screen (PRIMARY);
1249 ncol = ocol;
1250 }
1251
1252 scr_reset (); 1111 scr_reset ();
1253
1254 if (curr_screen >= 0) /* this is not the first time through */
1255 {
1256 scr_change_screen (curr_screen);
1257 selection_check (old_ncol != ncol ? 4 : 0);
1258 }
1259 }
1260
1261 old_width = szHint.width;
1262 old_height = szHint.height;
1263 1112
1264#ifdef XPM_BACKGROUND 1113#ifdef XPM_BACKGROUND
1265 if (pixmap) 1114 if (pixmap)
1266 scr_touch (false); 1115 scr_touch (false);
1267#endif 1116#endif
… …
1280{ 1129{
1281 XWindowAttributes wattr; 1130 XWindowAttributes wattr;
1282 1131
1283 if (newwidth == 0 || newheight == 0) 1132 if (newwidth == 0 || newheight == 0)
1284 { 1133 {
1285 XGetWindowAttributes (display->display, display->root, &wattr); 1134 XGetWindowAttributes (xdisp, display->root, &wattr);
1286 1135
1287 if (newwidth == 0) 1136 if (newwidth == 0)
1288 newwidth = wattr.width - szHint.base_width; 1137 newwidth = wattr.width - szHint.base_width;
1289 if (newheight == 0) 1138 if (newheight == 0)
1290 newheight = wattr.height - szHint.base_height; 1139 newheight = wattr.height - szHint.base_height;
… …
1304#ifdef USE_XIM 1153#ifdef USE_XIM
1305 1154
1306void 1155void
1307rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1156rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1308{ 1157{
1309 fg = pix_colors[Color_fg]; 1158 fg = pix_colors [Color_fg];
1310 bg = pix_colors[Color_bg]; 1159 bg = pix_colors [Color_bg];
1311} 1160}
1312 1161
1313void 1162void
1314rxvt_term::im_set_size (XRectangle &size) 1163rxvt_term::im_set_size (XRectangle &size)
1315{ 1164{
… …
1352 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1353 1202
1354 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1355 *p = '\0'; 1204 *p = '\0';
1356 1205
1357 atom = XInternAtom (display->display, server, False); 1206 atom = XInternAtom (xdisp, server, False);
1358 win = XGetSelectionOwner (display->display, atom); 1207 win = XGetSelectionOwner (xdisp, atom);
1359 1208
1360 if (win != None) 1209 if (win != None)
1361 return True; 1210 return True;
1362 } 1211 }
1363 1212
… …
1370 XPoint nspot; 1219 XPoint nspot;
1371 XVaNestedList preedit_attr; 1220 XVaNestedList preedit_attr;
1372 1221
1373 if (!Input_Context 1222 if (!Input_Context
1374 || !focus 1223 || !focus
1375 || !(input_style & XIMPreeditPosition)) 1224 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1376 return; 1225 return;
1377 1226
1378 im_set_position (nspot); 1227 im_set_position (nspot);
1379 1228
1380 if (nspot.x == spot.x && nspot.y == spot.y) 1229 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1399 input_method = 0; 1248 input_method = 0;
1400 } 1249 }
1401 1250
1402 Input_Context = 0; 1251 Input_Context = 0;
1403} 1252}
1253
1254#ifdef ENABLE_XIM_ONTHESPOT
1255
1256static void
1257xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1258{
1259 ((rxvt_term *)client_data)->make_current ();
1260 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1261}
1262
1263static void
1264xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1265{
1266 ((rxvt_term *)client_data)->make_current ();
1267 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1268}
1269
1270static void
1271xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1272{
1273 rxvt_term *term = (rxvt_term *)client_data;
1274 XIMText *text = call_data->text;
1275
1276 term->make_current ();
1277
1278 if (text)
1279 {
1280 void *str;
1281
1282 if (!text->encoding_is_wchar && text->string.multi_byte)
1283 {
1284 // of course, X makes it ugly again
1285 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->rs[Rs_imLocale]);
1287
1288 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1289 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1290
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->locale);
1293 }
1294 else
1295 str = (void *)text->string.wide_char;
1296
1297 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1298 DT_INT, call_data->caret,
1299 DT_INT, call_data->chg_first,
1300 DT_INT, call_data->chg_length,
1301 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1302 DT_WCS_LEN, str, str ? (int)text->length : 0,
1303 DT_END));
1304 }
1305 else
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length,
1310 DT_END));
1311}
1312
1313#if 0
1314static void
1315xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1316{
1317 ((rxvt_term *)client_data)->make_current ();
1318 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1319 DT_INT, call_data->position,
1320 DT_INT, call_data->direction,
1321 DT_INT, call_data->style,
1322 DT_END));
1323}
1324#endif
1325
1326#endif
1404 1327
1405/* 1328/*
1406 * Try to open a XIM with the current modifiers, then see if we can 1329 * Try to open a XIM with the current modifiers, then see if we can
1407 * open a suitable preedit type 1330 * open a suitable preedit type
1408 */ 1331 */
… …
1415 XRectangle rect, status_rect, needed_rect; 1338 XRectangle rect, status_rect, needed_rect;
1416 unsigned long fg, bg; 1339 unsigned long fg, bg;
1417 const char *p; 1340 const char *p;
1418 char **s; 1341 char **s;
1419 XIMStyles *xim_styles; 1342 XIMStyles *xim_styles;
1343#ifdef ENABLE_XIM_ONTHESPOT
1344 XIMCallback xcb[4];
1345#endif
1420 1346
1421 set_environ (envv); 1347 set_environ (envv);
1422 1348
1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1349 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424 return false; 1350 return false;
1425 1351
1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427 input_method = display->get_xim (locale, modifiers); 1352 input_method = display->get_xim (locale, modifiers);
1428 if (input_method == NULL) 1353 if (input_method == NULL)
1429 return false; 1354 return false;
1430 1355
1431 xim = input_method->xim; 1356 xim = input_method->xim;
… …
1451 s = rxvt_splitcommastring (p); 1376 s = rxvt_splitcommastring (p);
1452 1377
1453 for (i = found = 0; !found && s[i]; i++) 1378 for (i = found = 0; !found && s[i]; i++)
1454 { 1379 {
1455 if (!strcmp (s[i], "OverTheSpot")) 1380 if (!strcmp (s[i], "OverTheSpot"))
1456 input_style = (XIMPreeditPosition | XIMStatusNothing); 1381 input_style = XIMPreeditPosition | XIMStatusNothing;
1457 else if (!strcmp (s[i], "OffTheSpot")) 1382 else if (!strcmp (s[i], "OffTheSpot"))
1458 input_style = (XIMPreeditArea | XIMStatusArea); 1383 input_style = XIMPreeditArea | XIMStatusArea;
1459 else if (!strcmp (s[i], "Root")) 1384 else if (!strcmp (s[i], "Root"))
1460 input_style = (XIMPreeditNothing | XIMStatusNothing); 1385 input_style = XIMPreeditNothing | XIMStatusNothing;
1461 else if (!strcmp (s[i], "None")) 1386 else if (!strcmp (s[i], "None"))
1462 input_style = (XIMPreeditNone | XIMStatusNone); 1387 input_style = XIMPreeditNone | XIMStatusNone;
1388#ifdef ENABLE_XIM_ONTHESPOT
1389 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1390 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1391#endif
1392 else
1393 input_style = XIMPreeditNothing | XIMStatusNothing;
1463 1394
1464 for (j = 0; j < xim_styles->count_styles; j++) 1395 for (j = 0; j < xim_styles->count_styles; j++)
1465 if (input_style == xim_styles->supported_styles[j]) 1396 if (input_style == xim_styles->supported_styles[j])
1466 { 1397 {
1467 rxvt_freecommastring (s); 1398 rxvt_freecommastring (s);
… …
1505 "*", 1436 "*",
1506 fheight, 1437 fheight,
1507 fheight + 1, fheight - 1, 1438 fheight + 1, fheight - 1,
1508 fheight - 2, fheight + 2); 1439 fheight - 2, fheight + 2);
1509 1440
1510 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1441 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1511 &missing_charset_list, &missing_charset_count, &def_string); 1442 &missing_charset_list, &missing_charset_count, &def_string);
1512 1443
1513 if (missing_charset_list) 1444 if (missing_charset_list)
1514 XFreeStringList (missing_charset_list); 1445 XFreeStringList (missing_charset_list);
1515 1446
… …
1556 XNBackground, bg, 1487 XNBackground, bg,
1557 XNArea, &status_rect, 1488 XNArea, &status_rect,
1558 XNFontSet, fs, 1489 XNFontSet, fs,
1559 NULL); 1490 NULL);
1560 } 1491 }
1492#if ENABLE_XIM_ONTHESPOT
1493 else if (input_style & XIMPreeditCallbacks)
1494 {
1495 im_set_position (spot);
1496
1497 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1498 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1499 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1500# if 0
1501 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1502# endif
1503
1504 preedit_attr = XVaCreateNestedList (0,
1505 XNSpotLocation, &spot,
1506 XNPreeditStartCallback, &xcb[0],
1507 XNPreeditDoneCallback , &xcb[1],
1508 XNPreeditDrawCallback , &xcb[2],
1509# if 0
1510 XNPreeditCaretCallback, &xcb[3],
1511# endif
1512 NULL);
1513 }
1514#endif
1561 1515
1562 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1563 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1564 XNClientWindow, vt, 1518 XNClientWindow, vt,
1565 XNFocusWindow, parent[0], 1519 XNFocusWindow, parent[0],
… …
1568 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1569 status_attr, NULL); 1523 status_attr, NULL);
1570 1524
1571 if (preedit_attr) XFree (preedit_attr); 1525 if (preedit_attr) XFree (preedit_attr);
1572 if (status_attr) XFree (status_attr); 1526 if (status_attr) XFree (status_attr);
1573 if (fs) XFreeFontSet (display->display, fs); 1527 if (fs) XFreeFontSet (xdisp, fs);
1574 1528
1575 if (Input_Context == NULL) 1529 if (Input_Context == NULL)
1576 { 1530 {
1577 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578 im_destroy (); 1532 im_destroy ();
1579 return false; 1533 return false;
1580 } 1534 }
1581 1535
1536#if 0
1537 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input ();
1540#endif
1541
1582 if (input_style & XIMPreeditArea) 1542 if (input_style & XIMPreeditArea)
1583 IMSetStatusPosition (); 1543 IMSetStatusPosition ();
1584 1544
1585 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586 return true; 1545 return true;
1587} 1546}
1588 1547
1589void 1548void
1590rxvt_term::im_cb () 1549rxvt_term::im_cb ()
… …
1596 1555
1597 make_current (); 1556 make_current ();
1598 1557
1599 im_destroy (); 1558 im_destroy ();
1600 1559
1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602 if (Input_Context) 1560 if (Input_Context)
1603 return; 1561 return;
1604 1562
1605#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1563#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1606 if (rs[Rs_imLocale]) 1564 if (rs[Rs_imLocale])
… …
1679 XFree (preedit_attr); 1637 XFree (preedit_attr);
1680 XFree (status_attr); 1638 XFree (status_attr);
1681} 1639}
1682#endif /* USE_XIM */ 1640#endif /* USE_XIM */
1683 1641
1684/*----------------------------------------------------------------------*/
1685rxvt_t rxvt_current_term;
1686
1687/*----------------------- end-of-file (C source) -----------------------*/ 1642/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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