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.185 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.226 by root, Thu Jul 6 23:48:11 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>
… …
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
… …
155} 143}
156#endif 144#endif
157 145
158rxvt_term::rxvt_term () 146rxvt_term::rxvt_term ()
159 : 147 :
160#if TRANSPARENT 148#if TRANSPARENT || ENABLE_PERL
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 150#endif
163#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 153#endif
… …
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 pty_ev.stop ();
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 204 delete pty; pty = 0;
219} 205}
220 206
221rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
222{ 208{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 209 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 210
227 emergency_cleanup (); 211 emergency_cleanup ();
228 212
229#if ENABLE_STYLES 213#if ENABLE_STYLES
… …
233#endif 217#endif
234 delete fontset[0]; 218 delete fontset[0];
235 219
236 if (display) 220 if (display)
237 { 221 {
238 dDisp;
239
240 selection_clear (); 222 selection_clear ();
241 223
242#ifdef USE_XIM 224#ifdef USE_XIM
243 im_destroy (); 225 im_destroy ();
244#endif 226#endif
245#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 230#endif
249#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 233#endif
252#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 245#endif
264#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 250#endif
269 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
270 252
271 delete drawable; 253 delete drawable;
272 // destroy all windows 254 // destroy all windows
273 if (parent[0]) 255 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
275 }
276 257
277 // 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
278 delete pix_colors_focused; 270 delete pix_colors_focused;
279#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
281#endif 273#endif
282 274
… …
288 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 281 free (allocated [i]);
290 282
291 free (selection.text); 283 free (selection.text);
292 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 285 free (env_display);
295 free (env_term); 286 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 287 free (locale);
298 free (v_buffer); 288 free (v_buffer);
299 free (incr_buf); 289 free (incr_buf);
300 290
301 delete envv; 291 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 294#ifdef KEYSYM_RESOURCE
305 delete keyboard; 295 delete keyboard;
306#endif 296#endif
307} 297}
308 298
299// child has exited, usually destroys
309void 300void
310rxvt_term::child_exit () 301rxvt_term::child_cb (child_watcher &w, int status)
311{ 302{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304
312 cmd_pid = 0; 305 cmd_pid = 0;
313 306
314 if (!OPTION (Opt_hold)) 307 if (!OPTION (Opt_hold))
315 destroy (); 308 destroy ();
316} 309}
… …
319rxvt_term::destroy () 312rxvt_term::destroy ()
320{ 313{
321 if (destroy_ev.active) 314 if (destroy_ev.active)
322 return; 315 return;
323 316
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318
324#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
325 scr_overlay_off (); 320 scr_overlay_off ();
326#endif 321#endif
327 322
328 if (display) 323 if (display)
… …
331 im_ev.stop (display); 326 im_ev.stop (display);
332#endif 327#endif
333#if HAVE_SCROLLBARS 328#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
335#endif 330#endif
336#if TRANSPARENT 331#if TRANSPARENT || ENABLE_PERL
337 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
338#endif 333#endif
339 incr_ev.stop (); 334 incr_ev.stop ();
340 termwin_ev.stop (display); 335 termwin_ev.stop (display);
341 vt_ev.stop (display); 336 vt_ev.stop (display);
… …
382{ 377{
383 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++)
384 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
385} 380}
386 381
387#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
388static void 383static void
389print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
390{ 385{
391 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
441 else 436 else
442 { 437 {
443 // 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,
444 // so just output the error and continue 439 // so just output the error and continue
445#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
446 print_x_error (display, event); 443 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 444#endif
450 } 445 }
451 446
452 return 0; 447 return 0;
453} 448}
… …
461 _exit (EXIT_FAILURE); 456 _exit (EXIT_FAILURE);
462} 457}
463 458
464/*----------------------------------------------------------------------*/ 459/*----------------------------------------------------------------------*/
465bool 460bool
466rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 462{
463 this->envv = envv;
464
468 SET_R (this); 465 SET_R (this);
469 set_locale (""); 466 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 467 set_environ (envv); // few things in X do not call setlocale :(
471 468
472 if (!init_vars ()) 469 if (!init_vars ())
… …
483#ifdef HAVE_SCROLLBARS 480#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 481 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 483#endif
487 484
488#if ENABLE_PERL 485 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
514 pty = rxvt_new_ptytty ();
515 486
516 create_windows (argc, argv); 487 create_windows (argc, argv);
517 488
518 dDisp;
519
520 init_xlocale (); 489 init_xlocale ();
521 490
522 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
523 492
524#if 0 493#if 0
525 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
526#endif 495#endif
527 496
528#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
531#endif 500#endif
532#ifdef TRANSPARENT 501#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
534 { 503 {
535 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
536 check_our_parents (); 505 check_our_parents ();
537 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
538 } 507 }
539#endif 508#endif
540 509#if ENABLE_PERL
541 XMapWindow (disp, vt); 510 rootwin_ev.start (display, display->root);
542 XMapWindow (disp, parent[0]); 511#endif
543 512
544 set_colorfgbg (); 513 set_colorfgbg ();
545 514
546 init_command (cmd_argv); 515 init_command (cmd_argv);
547 516
… …
552 521
553 check_ev.start (); 522 check_ev.start ();
554 523
555 HOOK_INVOKE ((this, HOOK_START, DT_END)); 524 HOOK_INVOKE ((this, HOOK_START, DT_END));
556 525
526#if ENABLE_XEMBED
527 if (rs[Rs_embed])
528 {
529 long info[2] = { 0, XEMBED_MAPPED };
530
531 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
532 32, PropModeReplace, (unsigned char *)&info, 2);
533 }
534#endif
535
536 XMapWindow (dpy, vt);
537 XMapWindow (dpy, parent[0]);
538
557 return true; 539 return true;
558} 540}
559 541
560static struct sig_handlers 542static struct sig_handlers
561{ 543{
562 sig_watcher sw_chld, sw_term, sw_int; 544 sig_watcher sw_term, sw_int;
563 545
564 void sig_chld (sig_watcher &w)
565 {
566 // we are being called for every SIGCHLD, find the corresponding term
567 int pid;
568
569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571 if (pid == (*t)->cmd_pid)
572 {
573 (*t)->child_exit ();
574 break;
575 }
576 }
577
578 /* 546 /*
579 * Catch a fatal signal and tidy up before quitting 547 * Catch a fatal signal and tidy up before quitting
580 */ 548 */
581 void 549 void
582 sig_term (sig_watcher &w) 550 sig_term (sig_watcher &w)
583 { 551 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup (); 552 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL); 553 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum); 554 kill (getpid (), w.signum);
590 } 555 }
591 556
592 sig_handlers () 557 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 558 : sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term) 559 sw_int (this, &sig_handlers::sig_term)
596 { 560 {
597 } 561 }
598} sig_handlers; 562} sig_handlers;
599 563
600char **rxvt_environ; // startup environment 564char **rxvt_environ; // startup environment
601 565
602void 566void
603rxvt_init () 567rxvt_init ()
604{ 568{
569 ptytty::init ();
570
605 rxvt_environ = environ; 571 rxvt_environ = environ;
606
607 /*
608 * Save and then give up any super-user privileges
609 * If we need privileges in any area then we must specifically request it.
610 * We should only need to be root in these cases:
611 * 1. write utmp entries on some systems
612 * 2. chown tty on some systems
613 */
614 rxvt_privileges (SAVE);
615 rxvt_privileges (IGNORE);
616 572
617 signal (SIGHUP, SIG_IGN); 573 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 574 signal (SIGPIPE, SIG_IGN);
619 575
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 576 sig_handlers.sw_term.start (SIGTERM);
622 sig_handlers.sw_int.start (SIGINT); 577 sig_handlers.sw_int.start (SIGINT);
623 578
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 579 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 580 /* signal (SIGURG, SIG_DFL); */
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 609 rxvt_fatal ("memory allocation failure. aborting.\n");
655 610
656 return p; 611 return p;
657} 612}
658 613
659void * 614void *
660rxvt_realloc (void *ptr, size_t size) 615rxvt_realloc (void *ptr, size_t size)
661{ 616{
662 void *p = realloc (ptr, size); 617 void *p = realloc (ptr, size);
663 618
664 if (!p) 619 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 620 rxvt_fatal ("memory allocation failure. aborting.\n");
666 621
667 return p; 622 return p;
668}
669
670/* ------------------------------------------------------------------------- *
671 * PRIVILEGED OPERATIONS *
672 * ------------------------------------------------------------------------- */
673/* take care of suid/sgid super-user (root) privileges */
674void
675rxvt_privileges (rxvt_privaction action)
676{
677#if ! defined(__CYGWIN32__)
678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679 /* setreuid () is the poor man's setuid (), seteuid () */
680# define seteuid(a) setreuid(-1, (a))
681# define setegid(a) setregid(-1, (a))
682# define HAVE_SETEUID
683# endif
684# ifdef HAVE_SETEUID
685 switch (action)
686 {
687 case IGNORE:
688 /*
689 * change effective uid/gid - not real uid/gid - so we can switch
690 * back to root later, as required
691 */
692 setegid (getgid ());
693 seteuid (getuid ());
694 break;
695 case SAVE:
696 saved_egid = getegid ();
697 saved_euid = geteuid ();
698 break;
699 case RESTORE:
700 setegid (saved_egid);
701 seteuid (saved_euid);
702 break;
703 }
704# else
705 switch (action)
706 {
707 case IGNORE:
708 setgid (getgid ());
709 setuid (getuid ());
710 /* FALLTHROUGH */
711 case SAVE:
712 /* FALLTHROUGH */
713 case RESTORE:
714 break;
715 }
716# endif
717#endif
718} 623}
719 624
720/*----------------------------------------------------------------------*/ 625/*----------------------------------------------------------------------*/
721/* 626/*
722 * window size/position calculcations for XSizeHint and other storage. 627 * window size/position calculcations for XSizeHint and other storage.
… …
727{ 632{
728 short recalc_x, recalc_y; 633 short recalc_x, recalc_y;
729 int x, y, sb_w, flags; 634 int x, y, sb_w, flags;
730 unsigned int w, h; 635 unsigned int w, h;
731 unsigned int max_width, max_height; 636 unsigned int max_width, max_height;
732 dDisp;
733
734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
735 ncol, nrow, szHint.width, szHint.height));
736 637
737 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 638 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
738 szHint.win_gravity = NorthWestGravity; 639 szHint.win_gravity = NorthWestGravity;
739 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 640 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740 641
… …
802 703
803 if (scrollBar.state) 704 if (scrollBar.state)
804 { 705 {
805 sb_w = scrollbar_TotalWidth (); 706 sb_w = scrollbar_TotalWidth ();
806 szHint.base_width += sb_w; 707 szHint.base_width += sb_w;
708
807 if (!OPTION (Opt_scrollBar_right)) 709 if (!OPTION (Opt_scrollBar_right))
808 window_vt_x += sb_w; 710 window_vt_x += sb_w;
809 } 711 }
810 712
811 szHint.width_inc = fwidth; 713 szHint.width_inc = fwidth;
812 szHint.height_inc = fheight; 714 szHint.height_inc = fheight;
813 szHint.min_width = szHint.base_width + szHint.width_inc; 715 szHint.min_width = szHint.base_width + szHint.width_inc;
814 szHint.min_height = szHint.base_height + szHint.height_inc; 716 szHint.min_height = szHint.base_height + szHint.height_inc;
815 717
816 if (newwidth && newwidth - szHint.base_width < max_width) 718 if (newwidth && newwidth - szHint.base_width < max_width)
817 { 719 {
818 szHint.width = newwidth; 720 szHint.width = newwidth;
… …
837 739
838 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 740 if (scrollBar.state && OPTION (Opt_scrollBar_right))
839 window_sb_x = szHint.width - sb_w; 741 window_sb_x = szHint.width - sb_w;
840 742
841 if (recalc_x) 743 if (recalc_x)
842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745
843 if (recalc_y) 746 if (recalc_y)
844 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 747 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
845 748
846 ncol = width / fwidth; 749 ncol = width / fwidth;
847 nrow = height / fheight; 750 nrow = height / fheight;
848 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
849 ncol, nrow, szHint.width,
850 szHint.height));
851 return;
852} 751}
853 752
854/*----------------------------------------------------------------------*/ 753/*----------------------------------------------------------------------*/
855/* 754/*
856 * Tell the teletype handler what size the window is. 755 * Tell the teletype handler what size the window is.
… …
956 return true; 855 return true;
957} 856}
958 857
959void rxvt_term::set_string_property (Atom prop, const char *str, int len) 858void rxvt_term::set_string_property (Atom prop, const char *str, int len)
960{ 859{
961 XChangeProperty (display->display, parent[0], 860 XChangeProperty (dpy, parent[0],
962 prop, XA_STRING, 8, PropModeReplace, 861 prop, XA_STRING, 8, PropModeReplace,
963 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 862 (const unsigned char *)str, len >= 0 ? len : strlen (str));
964} 863}
965 864
966void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
967{ 866{
968 wchar_t *ws = rxvt_mbstowcs (str, len); 867 wchar_t *ws = rxvt_mbstowcs (str, len);
969 char *s = rxvt_wcstoutf8 (ws); 868 char *s = rxvt_wcstoutf8 (ws);
970 869
971 XChangeProperty (display->display, parent[0], 870 XChangeProperty (dpy, parent[0],
972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
973 (const unsigned char *)s, strlen (s)); 872 (const unsigned char *)s, strlen (s));
974 873
975 free (s); 874 free (s);
976 free (ws); 875 free (ws);
… …
1001void 900void
1002rxvt_term::set_window_color (int idx, const char *color) 901rxvt_term::set_window_color (int idx, const char *color)
1003{ 902{
1004 rxvt_color xcol; 903 rxvt_color xcol;
1005 int i; 904 int i;
1006 905
1007 if (color == NULL || *color == '\0') 906 if (color == NULL || *color == '\0')
1008 return; 907 return;
908
909 color = strdup (color);
910 allocated.push_back ((void *)color);
911 rs[Rs_color + idx] = color;
1009 912
1010 /* handle color aliases */ 913 /* handle color aliases */
1011 if (isdigit (*color)) 914 if (isdigit (*color))
1012 { 915 {
1013 i = atoi (color); 916 i = atoi (color);
1014 917
1015 if (i >= 8 && i <= 15) 918 if (i >= 8 && i <= 15)
1016 { /* bright colors */ 919 { /* bright colors */
1017 i -= 8; 920 i -= 8;
1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 921 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1019 SET_PIXCOLOR (idx);
1020 goto done; 922 goto done;
1021 } 923 }
1022 924
1023 if (i >= 0 && i <= 7) 925 if (i >= 0 && i <= 7)
1024 { /* normal colors */ 926 { /* normal colors */
1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 927 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1026 SET_PIXCOLOR (idx);
1027 goto done; 928 goto done;
1028 } 929 }
1029 } 930 }
1030 931
1031 if (!rXParseAllocColor (&xcol, color)) 932 set_color (xcol, color);
1032 return;
1033
1034 /* XStoreColor (display->display, display->cmap, XColor*); */
1035 933
1036 /* 934 /*
1037 * FIXME: should free colors here, but no idea how to do it so instead, 935 * FIXME: should free colors here, but no idea how to do it so instead,
1038 * so just keep gobbling up the colormap 936 * so just keep gobbling up the colormap
1039 */ 937 */
1040# if 0
1041 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[idx] == pix_colors[i])
1043 break;
1044 if (i > Color_White)
1045 {
1046 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1047 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1048 DisplayPlanes (display->display, display->screen));
1049 }
1050# endif
1051 938
1052 pix_colors_focused[idx] = xcol; 939 pix_colors_focused[idx] = xcol;
1053 SET_PIXCOLOR (idx);
1054 940
1055 /* XSetWindowAttributes attr; */ 941 /* XSetWindowAttributes attr; */
1056 /* Cursor cursor; */ 942 /* Cursor cursor; */
1057done: 943done:
1058
1059#if OFF_FOCUS_FADING
1060 if (rs[Rs_fade])
1061 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1062#endif
1063
1064 /*TODO: handle Color_BD, scrollbar background, etc. */ 944 /*TODO: handle Color_BD, scrollbar background, etc. */
1065 945
946 update_fade_color (idx);
1066 recolour_cursor (); 947 recolour_cursor ();
1067 scr_recolour (); 948 scr_recolour ();
1068} 949}
1069 950
1070#else 951#else
… …
1072#endif /* XTERM_COLOR_CHANGE */ 953#endif /* XTERM_COLOR_CHANGE */
1073 954
1074void 955void
1075rxvt_term::recolour_cursor () 956rxvt_term::recolour_cursor ()
1076{ 957{
1077 XColor xcol[2]; 958 XColor fg, bg;
1078 959
1079 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 960 (ISSET_PIXCOLOR (Color_pointer_fg)
1080 ? pix_colors_focused[Color_pointer_fg] 961 ? pix_colors_focused[Color_pointer_fg]
1081 : pix_colors_focused[Color_fg]; 962 : pix_colors_focused[Color_fg]).get (fg);
963
1082 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 964 (ISSET_PIXCOLOR (Color_pointer_bg)
1083 ? pix_colors_focused[Color_pointer_bg] 965 ? pix_colors_focused[Color_pointer_bg]
1084 : pix_colors_focused[Color_bg]; 966 : pix_colors_focused[Color_bg]).get (bg);
1085 967
1086 XQueryColors (display->display, display->cmap, xcol, 2); 968 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1087 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1088} 969}
1089 970
1090/*----------------------------------------------------------------------*/ 971/*----------------------------------------------------------------------*/
1091/* 972/*
1092 * find if fg/bg matches any of the normal (low-intensity) colors 973 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1096{ 977{
1097 unsigned int i; 978 unsigned int i;
1098 const char *xpmb = "\0"; 979 const char *xpmb = "\0";
1099 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1100 981
1101 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1102 strcpy (fstr, "default"); 982 strcpy (fstr, "default");
1103 strcpy (bstr, "default"); 983 strcpy (bstr, "default");
1104 for (i = Color_Black; i <= Color_White; i++) 984 for (i = Color_Black; i <= Color_White; i++)
1105 if (pix_colors[Color_fg] == pix_colors[i]) 985 if (pix_colors[Color_fg] == pix_colors[i])
1106 { 986 {
… …
1121 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1122} 1002}
1123 1003
1124/*----------------------------------------------------------------------*/ 1004/*----------------------------------------------------------------------*/
1125 1005
1126int 1006bool
1127rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1007rxvt_term::set_color (rxvt_color &color, const char *name)
1128{ 1008{
1129 if (!screen_in_out->set (display, colour)) 1009 if (color.set (this, name))
1130 {
1131 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1132 return false;
1133 }
1134
1135 return true; 1010 return true;
1011
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1013 return false;
1014}
1015
1016void
1017rxvt_term::alias_color (int dst, int src)
1018{
1019 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1136} 1020}
1137 1021
1138/* -------------------------------------------------------------------- * 1022/* -------------------------------------------------------------------- *
1139 * - WINDOW RESIZING - * 1023 * - WINDOW RESIZING - *
1140 * -------------------------------------------------------------------- */ 1024 * -------------------------------------------------------------------- */
1141void 1025void
1142rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1026rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1143{ 1027{
1144 int fix_screen; 1028 int fix_screen;
1145 int old_width = szHint.width, old_height = szHint.height; 1029 int old_width = szHint.width;
1146 dDisp; 1030 int old_height = szHint.height;
1147 1031
1148 window_calc (newwidth, newheight); 1032 window_calc (newwidth, newheight);
1033
1034 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1149 XSetWMNormalHints (disp, parent[0], &szHint); 1035 XSetWMNormalHints (dpy, parent[0], &szHint);
1150 1036
1151 if (!ignoreparent) 1037 if (!ignoreparent)
1152 { 1038 {
1153#ifdef SMART_RESIZE 1039#ifdef SMART_RESIZE
1154 /* 1040 /*
… …
1158 int x, y, x1, y1; 1044 int x, y, x1, y1;
1159 int dx, dy; 1045 int dx, dy;
1160 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1046 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1161 Window unused_cr; 1047 Window unused_cr;
1162 1048
1163 XTranslateCoordinates (disp, parent[0], display->root, 1049 XTranslateCoordinates (dpy, parent[0], display->root,
1164 0, 0, &x, &y, &unused_cr); 1050 0, 0, &x, &y, &unused_cr);
1165 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1051 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1166 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1052 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1167 /* 1053 /*
1168 * if display->root isn't the parent window, a WM will probably have offset 1054 * if display->root isn't the parent window, a WM will probably have offset
1169 * our position for handles and decorations. Counter it 1055 * our position for handles and decorations. Counter it
1170 */ 1056 */
… …
1172 { 1058 {
1173 x -= x1; 1059 x -= x1;
1174 y -= y1; 1060 y -= y1;
1175 } 1061 }
1176 1062
1177 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1063 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1178 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1064 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1179 dx = old_width - szHint.width; 1065 dx = old_width - szHint.width;
1180 dy = old_height - szHint.height; 1066 dy = old_height - szHint.height;
1181 1067
1182 /* Check position of the center of the window */ 1068 /* Check position of the center of the window */
1183 if (x < x1) /* left half */ 1069 if (x < x1) /* left half */
1184 dx = 0; 1070 dx = 0;
… …
1187 if (y < y1) /* top half */ 1073 if (y < y1) /* top half */
1188 dy = 0; 1074 dy = 0;
1189 else if (y == y1) /* exact center */ 1075 else if (y == y1) /* exact center */
1190 dy /= 2; 1076 dy /= 2;
1191 1077
1192 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1078 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1193 szHint.width, szHint.height); 1079 szHint.width, szHint.height);
1194#else 1080#else
1195 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1081 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1196#endif 1082#endif
1197 } 1083 }
1198 1084
1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1085 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1200 1086
1201 if (fix_screen || newwidth != old_width || newheight != old_height) 1087 if (fix_screen || newwidth != old_width || newheight != old_height)
1202 { 1088 {
1203 if (scrollBar.state) 1089 if (scrollBar.state)
1204 { 1090 {
1205 XMoveResizeWindow (disp, scrollBar.win, 1091 XMoveResizeWindow (dpy, scrollBar.win,
1206 window_sb_x, 0, 1092 window_sb_x, 0,
1207 scrollbar_TotalWidth (), szHint.height); 1093 scrollbar_TotalWidth (), szHint.height);
1208 resize_scrollbar (); 1094 resize_scrollbar ();
1209 } 1095 }
1210 1096
1211 XMoveResizeWindow (disp, vt, 1097 XMoveResizeWindow (dpy, vt,
1212 window_vt_x, window_vt_y, 1098 window_vt_x, window_vt_y,
1213 width, height); 1099 width, height);
1214 1100
1215 scr_clear (); 1101 scr_clear ();
1216#ifdef XPM_BACKGROUND 1102#ifdef XPM_BACKGROUND
1217 resize_pixmap (); 1103 resize_pixmap ();
1218#endif 1104#endif
1219 } 1105 }
1220 1106
1221 if (fix_screen || old_height == 0) 1107 if (fix_screen || old_height == 0)
1222 {
1223 int curr_screen = -1;
1224 int old_ncol = prev_ncol;
1225
1226 /* scr_reset only works on the primary screen */
1227 if (old_height) /* this is not the first time through */
1228 {
1229 unsigned int ocol = ncol;
1230 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1231 curr_screen = scr_change_screen (PRIMARY);
1232 ncol = ocol;
1233 }
1234
1235 scr_reset (); 1108 scr_reset ();
1236 1109
1237 if (curr_screen >= 0) /* this is not the first time through */ 1110 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1238 { 1111 //scr_touch (false);
1239 scr_change_screen (curr_screen);
1240 selection_check (old_ncol != ncol ? 4 : 0);
1241 }
1242 }
1243
1244 old_width = szHint.width;
1245 old_height = szHint.height;
1246 1112
1247#ifdef XPM_BACKGROUND 1113#ifdef XPM_BACKGROUND
1248 if (pixmap) 1114 if (pixmap)
1249 scr_touch (false); 1115 scr_touch (false);
1250#endif 1116#endif
1251 1117
1252#ifdef USE_XIM 1118#ifdef USE_XIM
1253 IMSetStatusPosition (); 1119 IMSetPosition ();
1254#endif 1120#endif
1255} 1121}
1256 1122
1257/* 1123/*
1258 * Set the width/height of the vt window in characters. Units are pixels. 1124 * Set the width/height of the vt window in characters. Units are pixels.
… …
1263{ 1129{
1264 XWindowAttributes wattr; 1130 XWindowAttributes wattr;
1265 1131
1266 if (newwidth == 0 || newheight == 0) 1132 if (newwidth == 0 || newheight == 0)
1267 { 1133 {
1268 XGetWindowAttributes (display->display, display->root, &wattr); 1134 XGetWindowAttributes (dpy, display->root, &wattr);
1269 1135
1270 if (newwidth == 0) 1136 if (newwidth == 0)
1271 newwidth = wattr.width - szHint.base_width; 1137 newwidth = wattr.width - szHint.base_width;
1272 if (newheight == 0) 1138 if (newheight == 0)
1273 newheight = wattr.height - szHint.base_height; 1139 newheight = wattr.height - szHint.base_height;
… …
1287#ifdef USE_XIM 1153#ifdef USE_XIM
1288 1154
1289void 1155void
1290rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1156rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1291{ 1157{
1292 fg = pix_colors[Color_fg]; 1158 fg = pix_colors [Color_fg];
1293 bg = pix_colors[Color_bg]; 1159 bg = pix_colors [Color_bg];
1294} 1160}
1295 1161
1296void 1162void
1297rxvt_term::im_set_size (XRectangle &size) 1163rxvt_term::im_set_size (XRectangle &size)
1298{ 1164{
… …
1335 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1336 1202
1337 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1338 *p = '\0'; 1204 *p = '\0';
1339 1205
1340 atom = XInternAtom (display->display, server, False); 1206 atom = XInternAtom (dpy, server, False);
1341 win = XGetSelectionOwner (display->display, atom); 1207 win = XGetSelectionOwner (dpy, atom);
1342 1208
1343 if (win != None) 1209 if (win != None)
1344 return True; 1210 return True;
1345 } 1211 }
1346 1212
… …
1353 XPoint nspot; 1219 XPoint nspot;
1354 XVaNestedList preedit_attr; 1220 XVaNestedList preedit_attr;
1355 1221
1356 if (!Input_Context 1222 if (!Input_Context
1357 || !focus 1223 || !focus
1358 || !(input_style & XIMPreeditPosition)) 1224 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1359 return; 1225 return;
1360 1226
1361 im_set_position (nspot); 1227 im_set_position (nspot);
1362 1228
1363 if (nspot.x == spot.x && nspot.y == spot.y) 1229 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1382 input_method = 0; 1248 input_method = 0;
1383 } 1249 }
1384 1250
1385 Input_Context = 0; 1251 Input_Context = 0;
1386} 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
1387 1327
1388/* 1328/*
1389 * 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
1390 * open a suitable preedit type 1330 * open a suitable preedit type
1391 */ 1331 */
… …
1398 XRectangle rect, status_rect, needed_rect; 1338 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1339 unsigned long fg, bg;
1400 const char *p; 1340 const char *p;
1401 char **s; 1341 char **s;
1402 XIMStyles *xim_styles; 1342 XIMStyles *xim_styles;
1343#ifdef ENABLE_XIM_ONTHESPOT
1344 XIMCallback xcb[4];
1345#endif
1403 1346
1404 set_environ (envv); 1347 set_environ (envv);
1405 1348
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1349 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1350 return false;
1408 1351
1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410 input_method = display->get_xim (locale, modifiers); 1352 input_method = display->get_xim (locale, modifiers);
1411 if (input_method == NULL) 1353 if (input_method == NULL)
1412 return false; 1354 return false;
1413 1355
1414 xim = input_method->xim; 1356 xim = input_method->xim;
… …
1434 s = rxvt_splitcommastring (p); 1376 s = rxvt_splitcommastring (p);
1435 1377
1436 for (i = found = 0; !found && s[i]; i++) 1378 for (i = found = 0; !found && s[i]; i++)
1437 { 1379 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1380 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = (XIMPreeditPosition | XIMStatusNothing); 1381 input_style = XIMPreeditPosition | XIMStatusNothing;
1440 else if (!strcmp (s[i], "OffTheSpot")) 1382 else if (!strcmp (s[i], "OffTheSpot"))
1441 input_style = (XIMPreeditArea | XIMStatusArea); 1383 input_style = XIMPreeditArea | XIMStatusArea;
1442 else if (!strcmp (s[i], "Root")) 1384 else if (!strcmp (s[i], "Root"))
1443 input_style = (XIMPreeditNothing | XIMStatusNothing); 1385 input_style = XIMPreeditNothing | XIMStatusNothing;
1444 else if (!strcmp (s[i], "None")) 1386 else if (!strcmp (s[i], "None"))
1445 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;
1446 1394
1447 for (j = 0; j < xim_styles->count_styles; j++) 1395 for (j = 0; j < xim_styles->count_styles; j++)
1448 if (input_style == xim_styles->supported_styles[j]) 1396 if (input_style == xim_styles->supported_styles[j])
1449 { 1397 {
1450 rxvt_freecommastring (s); 1398 rxvt_freecommastring (s);
… …
1488 "*", 1436 "*",
1489 fheight, 1437 fheight,
1490 fheight + 1, fheight - 1, 1438 fheight + 1, fheight - 1,
1491 fheight - 2, fheight + 2); 1439 fheight - 2, fheight + 2);
1492 1440
1493 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1441 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1494 &missing_charset_list, &missing_charset_count, &def_string); 1442 &missing_charset_list, &missing_charset_count, &def_string);
1495 1443
1496 if (missing_charset_list) 1444 if (missing_charset_list)
1497 XFreeStringList (missing_charset_list); 1445 XFreeStringList (missing_charset_list);
1498 1446
… …
1539 XNBackground, bg, 1487 XNBackground, bg,
1540 XNArea, &status_rect, 1488 XNArea, &status_rect,
1541 XNFontSet, fs, 1489 XNFontSet, fs,
1542 NULL); 1490 NULL);
1543 } 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
1544 1515
1545 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1546 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1547 XNClientWindow, vt, 1518 XNClientWindow, vt,
1548 XNFocusWindow, parent[0], 1519 XNFocusWindow, parent[0],
… …
1550 preedit_attr, 1521 preedit_attr,
1551 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1552 status_attr, NULL); 1523 status_attr, NULL);
1553 1524
1554 if (preedit_attr) XFree (preedit_attr); 1525 if (preedit_attr) XFree (preedit_attr);
1555 if (status_attr) XFree (status_attr); 1526 if (status_attr) XFree (status_attr);
1556 if (fs) XFreeFontSet (display->display, fs); 1527 if (fs) XFreeFontSet (dpy, fs);
1557 1528
1558 if (Input_Context == NULL) 1529 if (Input_Context == NULL)
1559 { 1530 {
1560 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561 im_destroy (); 1532 im_destroy ();
1562 return false; 1533 return false;
1563 } 1534 }
1564 1535
1565 if (input_style & XIMPreeditArea) 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
1566 IMSetStatusPosition (); 1542 IMSetPosition ();
1567 1543
1568 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569 return true; 1544 return true;
1570} 1545}
1571 1546
1572void 1547void
1573rxvt_term::im_cb () 1548rxvt_term::im_cb ()
… …
1579 1554
1580 make_current (); 1555 make_current ();
1581 1556
1582 im_destroy (); 1557 im_destroy ();
1583 1558
1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585 if (Input_Context) 1559 if (Input_Context)
1586 return; 1560 return;
1587 1561
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1562#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1563 if (rs[Rs_imLocale])
… …
1631 SET_LOCALE (locale); 1605 SET_LOCALE (locale);
1632#endif 1606#endif
1633} 1607}
1634 1608
1635void 1609void
1636rxvt_term::IMSetStatusPosition () 1610rxvt_term::IMSetPosition ()
1637{ 1611{
1638 XRectangle preedit_rect, status_rect, *needed_rect; 1612 XRectangle preedit_rect, status_rect, *needed_rect;
1639 XVaNestedList preedit_attr, status_attr; 1613 XVaNestedList preedit_attr, status_attr;
1640 1614
1641 if (!Input_Context 1615 if (!Input_Context
1642 || !focus 1616 || !focus
1643 || !(input_style & XIMPreeditArea) 1617 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1644 || !IMisRunning ()) 1618 || !IMisRunning ())
1645 return; 1619 return;
1646 1620
1621 if (input_style & XIMPreeditPosition)
1622 {
1623 im_set_size (preedit_rect);
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625
1626 XSetICValues (Input_Context,
1627 XNPreeditAttributes, preedit_attr, NULL);
1628 }
1629 else
1630 {
1647 /* Getting the necessary width of preedit area */ 1631 /* Getting the necessary width of preedit area */
1648 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1632 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1649 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1633 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1650 XFree (status_attr); 1634 XFree (status_attr);
1651 1635
1652 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1636 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1653 XFree (needed_rect); 1637 XFree (needed_rect);
1654 1638
1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1639 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1656 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1640 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1657 1641
1658 XSetICValues (Input_Context, 1642 XSetICValues (Input_Context,
1659 XNPreeditAttributes, preedit_attr, 1643 XNPreeditAttributes, preedit_attr,
1660 XNStatusAttributes, status_attr, NULL); 1644 XNStatusAttributes, status_attr,
1645 NULL);
1661 1646
1647 XFree (status_attr);
1648 }
1649
1662 XFree (preedit_attr); 1650 XFree (preedit_attr);
1663 XFree (status_attr);
1664} 1651}
1665#endif /* USE_XIM */ 1652#endif /* USE_XIM */
1666 1653
1667/*----------------------------------------------------------------------*/
1668rxvt_t rxvt_current_term;
1669
1670/*----------------------- end-of-file (C source) -----------------------*/ 1654/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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