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.220 by root, Sat Feb 11 10:53:37 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
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 203 delete pty; pty = 0;
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 (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 229#endif
249#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 232#endif
252#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 244#endif
264#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 249#endif
269 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (dpy, 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 (dpy, 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
514 pty = rxvt_new_ptytty ();
515 485
516 create_windows (argc, argv); 486 create_windows (argc, argv);
517 487
518 dDisp;
519
520 init_xlocale (); 488 init_xlocale ();
521 489
522 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
523 491
524#if 0 492#if 0
525 XSynchronize (disp, True); 493 XSynchronize (dpy, True);
526#endif 494#endif
527 495
528#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
531#endif 499#endif
532#ifdef TRANSPARENT 500#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
534 { 502 {
535 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
536 check_our_parents (); 504 check_our_parents ();
537 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
538 } 506 }
539#endif 507#endif
540 508
541 XMapWindow (disp, vt);
542 XMapWindow (disp, parent[0]);
543
544 set_colorfgbg (); 509 set_colorfgbg ();
545 510
546 init_command (cmd_argv); 511 init_command (cmd_argv);
547 512
548 free (cmd_argv); 513 free (cmd_argv);
… …
552 517
553 check_ev.start (); 518 check_ev.start ();
554 519
555 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
556 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (dpy, vt);
533 XMapWindow (dpy, parent[0]);
534
557 return true; 535 return true;
558} 536}
559 537
560static struct sig_handlers 538static struct sig_handlers
561{ 539{
562 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
563 541
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 /* 542 /*
579 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
580 */ 544 */
581 void 545 void
582 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
583 { 547 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
590 } 551 }
591 552
592 sig_handlers () 553 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
596 { 556 {
597 } 557 }
598} sig_handlers; 558} sig_handlers;
599 559
600char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
601 561
602void 562void
603rxvt_init () 563rxvt_init ()
604{ 564{
565 ptytty::init ();
566
605 rxvt_environ = environ; 567 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 568
617 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
619 571
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
622 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
623 574
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
655 606
656 return p; 607 return p;
657} 608}
658 609
659void * 610void *
660rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
661{ 612{
662 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
663 614
664 if (!p) 615 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
666 617
667 return p; 618 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} 619}
719 620
720/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
721/* 622/*
722 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
… …
727{ 628{
728 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
729 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
730 unsigned int w, h; 631 unsigned int w, h;
731 unsigned int max_width, max_height; 632 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 633
737 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
738 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
739 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740 637
… …
802 699
803 if (scrollBar.state) 700 if (scrollBar.state)
804 { 701 {
805 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
806 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
807 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
808 window_vt_x += sb_w; 706 window_vt_x += sb_w;
809 } 707 }
810 708
811 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
812 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
813 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
814 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
815 713
816 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
817 { 715 {
818 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
837 735
838 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
839 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
840 738
841 if (recalc_x) 739 if (recalc_x)
842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
843 if (recalc_y) 742 if (recalc_y)
844 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
845 744
846 ncol = width / fwidth; 745 ncol = width / fwidth;
847 nrow = height / fheight; 746 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} 747}
853 748
854/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
855/* 750/*
856 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
… …
956 return true; 851 return true;
957} 852}
958 853
959void 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)
960{ 855{
961 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
962 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
963 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
964} 859}
965 860
966void 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)
967{ 862{
968 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
969 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
970 865
971 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
973 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
974 869
975 free (s); 870 free (s);
976 free (ws); 871 free (ws);
… …
1001void 896void
1002rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
1003{ 898{
1004 rxvt_color xcol; 899 rxvt_color xcol;
1005 int i; 900 int i;
1006 901
1007 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
1008 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
1009 908
1010 /* handle color aliases */ 909 /* handle color aliases */
1011 if (isdigit (*color)) 910 if (isdigit (*color))
1012 { 911 {
1013 i = atoi (color); 912 i = atoi (color);
1014 913
1015 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
1016 { /* bright colors */ 915 { /* bright colors */
1017 i -= 8; 916 i -= 8;
1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1019 SET_PIXCOLOR (idx);
1020 goto done; 918 goto done;
1021 } 919 }
1022 920
1023 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1024 { /* normal colors */ 922 { /* normal colors */
1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1026 SET_PIXCOLOR (idx);
1027 goto done; 924 goto done;
1028 } 925 }
1029 } 926 }
1030 927
1031 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1032 return;
1033
1034 /* XStoreColor (display->display, display->cmap, XColor*); */
1035 929
1036 /* 930 /*
1037 * 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,
1038 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1039 */ 933 */
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 934
1052 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1053 SET_PIXCOLOR (idx);
1054 936
1055 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1056 /* Cursor cursor; */ 938 /* Cursor cursor; */
1057done: 939done:
1058 940
1059#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1060 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1061 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 }
1062#endif 948#endif
1063 949
1064 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1065 951
1066 recolour_cursor (); 952 recolour_cursor ();
… …
1072#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1073 959
1074void 960void
1075rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1076{ 962{
1077 XColor xcol[2]; 963 XColor fg, bg;
1078 964
1079 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1080 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1081 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1082 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1083 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1084 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1085 972
1086 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1087 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1088} 974}
1089 975
1090/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1091/* 977/*
1092 * 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
… …
1096{ 982{
1097 unsigned int i; 983 unsigned int i;
1098 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1099 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1100 986
1101 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1102 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1103 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1104 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1105 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1106 { 991 {
… …
1121 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1122} 1007}
1123 1008
1124/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1125 1010
1126int 1011bool
1127rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1128{ 1013{
1129 if (!screen_in_out->set (display, colour)) 1014 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; 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]);
1136} 1025}
1137 1026
1138/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1139 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1140 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1141void 1030void
1142rxvt_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)
1143{ 1032{
1144 int fix_screen; 1033 int fix_screen;
1145 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1146 dDisp; 1035 int old_height = szHint.height;
1147 1036
1148 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1149 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1150 1041
1151 if (!ignoreparent) 1042 if (!ignoreparent)
1152 { 1043 {
1153#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1154 /* 1045 /*
… …
1158 int x, y, x1, y1; 1049 int x, y, x1, y1;
1159 int dx, dy; 1050 int dx, dy;
1160 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1161 Window unused_cr; 1052 Window unused_cr;
1162 1053
1163 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1164 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1165 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1166 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1167 /* 1058 /*
1168 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1169 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1170 */ 1061 */
… …
1172 { 1063 {
1173 x -= x1; 1064 x -= x1;
1174 y -= y1; 1065 y -= y1;
1175 } 1066 }
1176 1067
1177 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1178 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1179 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1180 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1181 1072
1182 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1183 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1184 dx = 0; 1075 dx = 0;
… …
1187 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1188 dy = 0; 1079 dy = 0;
1189 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1190 dy /= 2; 1081 dy /= 2;
1191 1082
1192 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1193 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1194#else 1085#else
1195 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1196#endif 1087#endif
1197 } 1088 }
1198 1089
1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1200 1091
1201 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1202 { 1093 {
1203 if (scrollBar.state) 1094 if (scrollBar.state)
1204 { 1095 {
1205 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1206 window_sb_x, 0, 1097 window_sb_x, 0,
1207 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1208 resize_scrollbar (); 1099 resize_scrollbar ();
1209 } 1100 }
1210 1101
1211 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1212 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1213 width, height); 1104 width, height);
1214 1105
1215 scr_clear (); 1106 scr_clear ();
1216#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1217 resize_pixmap (); 1108 resize_pixmap ();
1218#endif 1109#endif
1219 } 1110 }
1220 1111
1221 if (fix_screen || old_height == 0) 1112 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 (); 1113 scr_reset ();
1236 1114
1237 if (curr_screen >= 0) /* this is not the first time through */ 1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1238 { 1116 //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 1117
1247#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1248 if (pixmap) 1119 if (pixmap)
1249 scr_touch (false); 1120 scr_touch (false);
1250#endif 1121#endif
1251 1122
1252#ifdef USE_XIM 1123#ifdef USE_XIM
1253 IMSetStatusPosition (); 1124 IMSetPosition ();
1254#endif 1125#endif
1255} 1126}
1256 1127
1257/* 1128/*
1258 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1263{ 1134{
1264 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1265 1136
1266 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1267 { 1138 {
1268 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1269 1140
1270 if (newwidth == 0) 1141 if (newwidth == 0)
1271 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1272 if (newheight == 0) 1143 if (newheight == 0)
1273 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1287#ifdef USE_XIM 1158#ifdef USE_XIM
1288 1159
1289void 1160void
1290rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1291{ 1162{
1292 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1293 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1294} 1165}
1295 1166
1296void 1167void
1297rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1298{ 1169{
… …
1335 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1336 1207
1337 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1338 *p = '\0'; 1209 *p = '\0';
1339 1210
1340 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1341 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1342 1213
1343 if (win != None) 1214 if (win != None)
1344 return True; 1215 return True;
1345 } 1216 }
1346 1217
… …
1353 XPoint nspot; 1224 XPoint nspot;
1354 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1355 1226
1356 if (!Input_Context 1227 if (!Input_Context
1357 || !focus 1228 || !focus
1358 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1359 return; 1230 return;
1360 1231
1361 im_set_position (nspot); 1232 im_set_position (nspot);
1362 1233
1363 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1382 input_method = 0; 1253 input_method = 0;
1383 } 1254 }
1384 1255
1385 Input_Context = 0; 1256 Input_Context = 0;
1386} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1387 1332
1388/* 1333/*
1389 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1390 * open a suitable preedit type 1335 * open a suitable preedit type
1391 */ 1336 */
… …
1398 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1344 unsigned long fg, bg;
1400 const char *p; 1345 const char *p;
1401 char **s; 1346 char **s;
1402 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1403 1351
1404 set_environ (envv); 1352 set_environ (envv);
1405 1353
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1355 return false;
1408 1356
1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1411 if (input_method == NULL) 1358 if (input_method == NULL)
1412 return false; 1359 return false;
1413 1360
1414 xim = input_method->xim; 1361 xim = input_method->xim;
… …
1434 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1435 1382
1436 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1437 { 1384 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1440 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1441 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1442 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1443 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1444 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1445 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1446 1399
1447 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1448 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1449 { 1402 {
1450 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1488 "*", 1441 "*",
1489 fheight, 1442 fheight,
1490 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1491 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1492 1445
1493 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1494 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1495 1448
1496 if (missing_charset_list) 1449 if (missing_charset_list)
1497 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1498 1451
… …
1539 XNBackground, bg, 1492 XNBackground, bg,
1540 XNArea, &status_rect, 1493 XNArea, &status_rect,
1541 XNFontSet, fs, 1494 XNFontSet, fs,
1542 NULL); 1495 NULL);
1543 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1544 1520
1545 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1546 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1547 XNClientWindow, vt, 1523 XNClientWindow, vt,
1548 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1550 preedit_attr, 1526 preedit_attr,
1551 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1552 status_attr, NULL); 1528 status_attr, NULL);
1553 1529
1554 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1555 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1556 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1557 1533
1558 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1559 { 1535 {
1560 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561 im_destroy (); 1537 im_destroy ();
1562 return false; 1538 return false;
1563 } 1539 }
1564 1540
1565 if (input_style & XIMPreeditArea) 1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input ();
1545#endif
1546
1566 IMSetStatusPosition (); 1547 IMSetPosition ();
1567 1548
1568 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569 return true; 1549 return true;
1570} 1550}
1571 1551
1572void 1552void
1573rxvt_term::im_cb () 1553rxvt_term::im_cb ()
… …
1579 1559
1580 make_current (); 1560 make_current ();
1581 1561
1582 im_destroy (); 1562 im_destroy ();
1583 1563
1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585 if (Input_Context) 1564 if (Input_Context)
1586 return; 1565 return;
1587 1566
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1567#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1568 if (rs[Rs_imLocale])
… …
1631 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1632#endif 1611#endif
1633} 1612}
1634 1613
1635void 1614void
1636rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1637{ 1616{
1638 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1639 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1640 1619
1641 if (!Input_Context 1620 if (!Input_Context
1642 || !focus 1621 || !focus
1643 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1644 || !IMisRunning ()) 1623 || !IMisRunning ())
1645 return; 1624 return;
1646 1625
1647 /* Getting the necessary width of preedit area */ 1626 /* Getting the necessary width of preedit area */
1648 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
… …
1651 1630
1652 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1653 XFree (needed_rect); 1632 XFree (needed_rect);
1654 1633
1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1656 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1657 1636
1658 XSetICValues (Input_Context, 1637 XSetICValues (Input_Context,
1659 XNPreeditAttributes, preedit_attr, 1638 XNPreeditAttributes, preedit_attr,
1660 XNStatusAttributes, status_attr, NULL); 1639 XNStatusAttributes, status_attr,
1640 NULL);
1661 1641
1662 XFree (preedit_attr); 1642 XFree (preedit_attr);
1663 XFree (status_attr); 1643 XFree (status_attr);
1664} 1644}
1665#endif /* USE_XIM */ 1645#endif /* USE_XIM */
1666 1646
1667/*----------------------------------------------------------------------*/
1668rxvt_t rxvt_current_term;
1669
1670/*----------------------- end-of-file (C source) -----------------------*/ 1647/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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