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.231 by root, Sun Aug 27 10:14:47 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{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
73 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 67 return false;
75 68
76 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
78 return true; 71 return true;
79} 72}
80 73
81void 74void
82rxvt_push_locale (const char *locale) 75rxvt_push_locale (const char *locale) NOTHROW
83{ 76{
84 strcpy (savelocale, curlocale); 77 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 78 rxvt_set_locale (locale);
86} 79}
87 80
88void 81void
89rxvt_pop_locale () 82rxvt_pop_locale () NOTHROW
90{ 83{
91 rxvt_set_locale (savelocale); 84 rxvt_set_locale (savelocale);
92} 85}
93 86
94#if ENABLE_COMBINING 87#if ENABLE_COMBINING
… …
155} 148}
156#endif 149#endif
157 150
158rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
159 : 152 :
160#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 155#endif
163#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 158#endif
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 176#endif
184#ifdef USE_XIM 177#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
186#endif 179#endif
180#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb),
182#endif
187 termwin_ev (this, &rxvt_term::x_cb), 183 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 184 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 186 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 187 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 188 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 189 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 190 incr_ev (this, &rxvt_term::incr_cb)
… …
196 193
197 termlist.push_back (this); 194 termlist.push_back (this);
198 195
199#ifdef KEYSYM_RESOURCE 196#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 197 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 198#endif
205} 199}
206 200
207// clean up the most important stuff, do *not* call x or free mem etc. 201// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 202// for use before an emergency exit
209void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
210{ 204{
211 if (cmd_pid) 205 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
213 207
214#ifdef UTMP_SUPPORT 208 pty_ev.stop ();
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 209 delete pty; pty = 0;
219} 210}
220 211
221rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
222{ 213{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 215
227 emergency_cleanup (); 216 emergency_cleanup ();
228 217
229#if ENABLE_STYLES 218#if ENABLE_STYLES
… …
233#endif 222#endif
234 delete fontset[0]; 223 delete fontset[0];
235 224
236 if (display) 225 if (display)
237 { 226 {
238 dDisp;
239
240 selection_clear (); 227 selection_clear ();
241 228
242#ifdef USE_XIM 229#ifdef USE_XIM
243 im_destroy (); 230 im_destroy ();
244#endif 231#endif
245#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 235#endif
249#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 238#endif
252#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 250#endif
264#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 255#endif
269 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
270 257
271 delete drawable; 258 delete drawable;
272 // destroy all windows 259 // destroy all windows
273 if (parent[0]) 260 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
275 }
276 262
277 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
278 delete pix_colors_focused; 264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
279#if OFF_FOCUS_FADING 267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
281#endif 278#endif
282 279
283 displays.put (display); 280 displays.put (display);
284 281
285 scr_release (); 282 scr_release ();
… …
288 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 286 free (allocated [i]);
290 287
291 free (selection.text); 288 free (selection.text);
292 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 290 free (env_display);
295 free (env_term); 291 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 292 free (locale);
298 free (v_buffer); 293 free (v_buffer);
299 free (incr_buf); 294 free (incr_buf);
300 295
301 delete envv; 296 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
305 delete keyboard; 300 delete keyboard;
306#endif 301#endif
307} 302}
308 303
304// child has exited, usually destroys
309void 305void
310rxvt_term::child_exit () 306rxvt_term::child_cb (child_watcher &w, int status)
311{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
312 cmd_pid = 0; 310 cmd_pid = 0;
313 311
314 if (!OPTION (Opt_hold)) 312 if (!OPTION (Opt_hold))
315 destroy (); 313 destroy ();
316} 314}
… …
319rxvt_term::destroy () 317rxvt_term::destroy ()
320{ 318{
321 if (destroy_ev.active) 319 if (destroy_ev.active)
322 return; 320 return;
323 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
324#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
325 scr_overlay_off (); 325 scr_overlay_off ();
326#endif 326#endif
327 327
328 if (display) 328 if (display)
… …
331 im_ev.stop (display); 331 im_ev.stop (display);
332#endif 332#endif
333#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
335#endif 335#endif
336#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
337 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
338#endif 338#endif
339 incr_ev.stop (); 339 incr_ev.stop ();
340 termwin_ev.stop (display); 340 termwin_ev.stop (display);
341 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
382{ 382{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
385} 385}
386 386
387#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
388static void 388static void
389print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
390{ 390{
391 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
441 else 441 else
442 { 442 {
443 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 444 // so just output the error and continue
445#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
446 print_x_error (display, event); 448 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 449#endif
450 } 450 }
451 451
452 return 0; 452 return 0;
453} 453}
… …
461 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
462} 462}
463 463
464/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
465bool 465bool
466rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 467{
468 this->envv = envv;
469
468 SET_R (this); 470 SET_R (this);
469 set_locale (""); 471 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 472 set_environ (envv); // few things in X do not call setlocale :(
471 473
472 if (!init_vars ()) 474 if (!init_vars ())
… …
483#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 486 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 488#endif
487 489
488#if ENABLE_PERL 490 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 491
516 create_windows (argc, argv); 492 create_windows (argc, argv);
517 493
518 dDisp;
519
520 init_xlocale (); 494 init_xlocale ();
521 495
522 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
523 497
524#if 0 498#if 0
525 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
526#endif 500#endif
527 501
528#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
531#endif 505#endif
532#ifdef TRANSPARENT 506#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
534 { 508 {
535 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
536 check_our_parents (); 510 check_our_parents ();
537 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
538 } 512 }
539#endif 513#endif
540 514#if ENABLE_PERL
541 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
542 XMapWindow (disp, parent[0]); 516#endif
543 517
544 set_colorfgbg (); 518 set_colorfgbg ();
545 519
546 init_command (cmd_argv); 520 init_command (cmd_argv);
547 521
… …
552 526
553 check_ev.start (); 527 check_ev.start ();
554 528
555 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
556 530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
543
557 return true; 544 return true;
558} 545}
559 546
560static struct sig_handlers 547static struct sig_handlers
561{ 548{
562 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
563 550
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 /* 551 /*
579 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
580 */ 553 */
581 void 554 void
582 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
583 { 556 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
590 } 560 }
591 561
592 sig_handlers () 562 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
596 { 565 {
597 } 566 }
598} sig_handlers; 567} sig_handlers;
599 568
600char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
601 570
602void 571void
603rxvt_init () 572rxvt_init ()
604{ 573{
574 ptytty::init ();
575
605 rxvt_environ = environ; 576 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 577
617 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
619 580
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
622 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
623 583
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
655 615
656 return p; 616 return p;
657} 617}
658 618
659void * 619void *
660rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
661{ 621{
662 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
663 623
664 if (!p) 624 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
666 626
667 return p; 627 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} 628}
719 629
720/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
721/* 631/*
722 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
… …
727{ 637{
728 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
729 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
730 unsigned int w, h; 640 unsigned int w, h;
731 unsigned int max_width, max_height; 641 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 642
737 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
738 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
739 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740 646
… …
802 708
803 if (scrollBar.state) 709 if (scrollBar.state)
804 { 710 {
805 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
806 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
807 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
808 window_vt_x += sb_w; 715 window_vt_x += sb_w;
809 } 716 }
810 717
811 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
812 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
813 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
814 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
815 722
816 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
817 { 724 {
818 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
837 744
838 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
839 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
840 747
841 if (recalc_x) 748 if (recalc_x)
842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
843 if (recalc_y) 751 if (recalc_y)
844 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
845 753
846 ncol = width / fwidth; 754 ncol = width / fwidth;
847 nrow = height / fheight; 755 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} 756}
853 757
854/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
855/* 759/*
856 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
… …
908 delete fontset[0]; 812 delete fontset[0];
909 fontset[0] = fs; 813 fontset[0] = fs;
910 814
911 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
912 prop.height += lineSpace; 816 prop.height += lineSpace;
817
913 fs->set_prop (prop); 818 fs->set_prop (prop, false);
914 819
915 fwidth = prop.width; 820 fwidth = prop.width;
916 fheight = prop.height; 821 fheight = prop.height;
917 fbase = prop.ascent; 822 fbase = prop.ascent;
918 823
… …
927 { 832 {
928 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
929 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
930 835
931 if (res) 836 if (res)
932 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
933 else 841 else
934 { 842 {
935 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
936 844
937 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
938 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
939 } 849 }
940 850
941 fs->populate (res);
942 fs->set_prop (prop2);
943 } 851 }
944#else 852#else
945 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
946#endif 854#endif
947 } 855 }
… …
956 return true; 864 return true;
957} 865}
958 866
959void rxvt_term::set_string_property (Atom prop, const char *str, int len) 867void rxvt_term::set_string_property (Atom prop, const char *str, int len)
960{ 868{
961 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
962 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
963 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
964} 872}
965 873
966void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
967{ 875{
968 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
969 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
970 878
971 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
973 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
974 882
975 free (s); 883 free (s);
976 free (ws); 884 free (ws);
… …
1001void 909void
1002rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
1003{ 911{
1004 rxvt_color xcol; 912 rxvt_color xcol;
1005 int i; 913 int i;
1006 914
1007 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
1008 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
1009 921
1010 /* handle color aliases */ 922 /* handle color aliases */
1011 if (isdigit (*color)) 923 if (isdigit (*color))
1012 { 924 {
1013 i = atoi (color); 925 i = atoi (color);
1014 926
1015 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
1016 { /* bright colors */ 928 { /* bright colors */
1017 i -= 8; 929 i -= 8;
1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1019 SET_PIXCOLOR (idx);
1020 goto done; 931 goto done;
1021 } 932 }
1022 933
1023 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
1024 { /* normal colors */ 935 { /* normal colors */
1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1026 SET_PIXCOLOR (idx);
1027 goto done; 937 goto done;
1028 } 938 }
1029 } 939 }
1030 940
1031 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
1032 return;
1033
1034 /* XStoreColor (display->display, display->cmap, XColor*); */
1035 942
1036 /* 943 /*
1037 * FIXME: should free colors here, but no idea how to do it so instead, 944 * FIXME: should free colors here, but no idea how to do it so instead,
1038 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
1039 */ 946 */
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 947
1052 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
1053 SET_PIXCOLOR (idx);
1054 949
1055 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
1056 /* Cursor cursor; */ 951 /* Cursor cursor; */
1057done: 952done:
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. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
1065 954
955 update_fade_color (idx);
1066 recolour_cursor (); 956 recolour_cursor ();
1067 scr_recolour (); 957 scr_recolour ();
1068} 958}
1069 959
1070#else 960#else
… …
1072#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
1073 963
1074void 964void
1075rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
1076{ 966{
1077 XColor xcol[2]; 967 XColor fg, bg;
1078 968
1079 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
1080 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
1081 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
1082 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
1083 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
1084 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
1085 976
1086 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1087 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1088} 978}
1089 979
1090/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1091/* 981/*
1092 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1096{ 986{
1097 unsigned int i; 987 unsigned int i;
1098 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1099 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1100 990
1101 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1102 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1103 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1104 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1105 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1106 { 995 {
… …
1121 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1122} 1011}
1123 1012
1124/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1125 1014
1126int 1015bool
1127rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1128{ 1017{
1129 if (!screen_in_out->set (display, colour)) 1018 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; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1023}
1024
1025void
1026rxvt_term::alias_color (int dst, int src)
1027{
1028 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1136} 1029}
1137 1030
1138/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1139 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1140 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
1141void 1034void
1142rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1035rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1143{ 1036{
1144 int fix_screen; 1037 int fix_screen;
1145 int old_width = szHint.width, old_height = szHint.height; 1038 int old_width = szHint.width;
1146 dDisp; 1039 int old_height = szHint.height;
1147 1040
1148 window_calc (newwidth, newheight); 1041 window_calc (newwidth, newheight);
1042
1043 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1149 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1150 1045
1151 if (!ignoreparent) 1046 if (!ignoreparent)
1152 { 1047 {
1153#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1154 /* 1049 /*
… …
1158 int x, y, x1, y1; 1053 int x, y, x1, y1;
1159 int dx, dy; 1054 int dx, dy;
1160 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1161 Window unused_cr; 1056 Window unused_cr;
1162 1057
1163 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1164 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1165 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1166 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1167 /* 1062 /*
1168 * if display->root isn't the parent window, a WM will probably have offset 1063 * if display->root isn't the parent window, a WM will probably have offset
1169 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1170 */ 1065 */
… …
1172 { 1067 {
1173 x -= x1; 1068 x -= x1;
1174 y -= y1; 1069 y -= y1;
1175 } 1070 }
1176 1071
1177 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1178 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1179 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1180 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1181 1076
1182 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1183 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
1184 dx = 0; 1079 dx = 0;
… …
1187 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1188 dy = 0; 1083 dy = 0;
1189 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1190 dy /= 2; 1085 dy /= 2;
1191 1086
1192 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1193 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1194#else 1089#else
1195 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1196#endif 1091#endif
1197 } 1092 }
1198 1093
1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1200 1095
1201 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1202 { 1097 {
1203 if (scrollBar.state) 1098 if (scrollBar.state)
1204 { 1099 {
1205 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1206 window_sb_x, 0, 1101 window_sb_x, 0,
1207 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1208 resize_scrollbar (); 1103 resize_scrollbar ();
1209 } 1104 }
1210 1105
1211 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1212 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1213 width, height); 1108 width, height);
1214 1109
1215 scr_clear (); 1110 scr_clear ();
1216#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1217 resize_pixmap (); 1112 resize_pixmap ();
1218#endif 1113#endif
1219 } 1114 }
1220 1115
1221 if (fix_screen || old_height == 0) 1116 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 (); 1117 scr_reset ();
1236 1118
1237 if (curr_screen >= 0) /* this is not the first time through */ 1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1238 { 1120 //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 1121
1247#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1248 if (pixmap) 1123 if (pixmap)
1249 scr_touch (false); 1124 scr_touch (false);
1250#endif 1125#endif
1251 1126
1252#ifdef USE_XIM 1127#ifdef USE_XIM
1253 IMSetStatusPosition (); 1128 IMSetPosition ();
1254#endif 1129#endif
1255} 1130}
1256 1131
1257/* 1132/*
1258 * Set the width/height of the vt window in characters. Units are pixels. 1133 * Set the width/height of the vt window in characters. Units are pixels.
… …
1263{ 1138{
1264 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1265 1140
1266 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1267 { 1142 {
1268 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1269 1144
1270 if (newwidth == 0) 1145 if (newwidth == 0)
1271 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1272 if (newheight == 0) 1147 if (newheight == 0)
1273 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1287#ifdef USE_XIM 1162#ifdef USE_XIM
1288 1163
1289void 1164void
1290rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1291{ 1166{
1292 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1293 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1294} 1169}
1295 1170
1296void 1171void
1297rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1298{ 1173{
… …
1335 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1336 1211
1337 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1338 *p = '\0'; 1213 *p = '\0';
1339 1214
1340 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1341 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1342 1217
1343 if (win != None) 1218 if (win != None)
1344 return True; 1219 return True;
1345 } 1220 }
1346 1221
… …
1353 XPoint nspot; 1228 XPoint nspot;
1354 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1355 1230
1356 if (!Input_Context 1231 if (!Input_Context
1357 || !focus 1232 || !focus
1358 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1359 return; 1234 return;
1360 1235
1361 im_set_position (nspot); 1236 im_set_position (nspot);
1362 1237
1363 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1382 input_method = 0; 1257 input_method = 0;
1383 } 1258 }
1384 1259
1385 Input_Context = 0; 1260 Input_Context = 0;
1386} 1261}
1262
1263#ifdef ENABLE_XIM_ONTHESPOT
1264
1265static void
1266xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1270}
1271
1272static void
1273xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1274{
1275 ((rxvt_term *)client_data)->make_current ();
1276 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1277}
1278
1279static void
1280xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1281{
1282 rxvt_term *term = (rxvt_term *)client_data;
1283 XIMText *text = call_data->text;
1284
1285 term->make_current ();
1286
1287 if (text)
1288 {
1289 void *str;
1290
1291 if (!text->encoding_is_wchar && text->string.multi_byte)
1292 {
1293 // of course, X makes it ugly again
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->rs[Rs_imLocale]);
1296
1297 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1298 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1299
1300 if (term->rs[Rs_imLocale])
1301 SET_LOCALE (term->locale);
1302 }
1303 else
1304 str = (void *)text->string.wide_char;
1305
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_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1311 DT_WCS_LEN, str, str ? (int)text->length : 0,
1312 DT_END));
1313 }
1314 else
1315 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1316 DT_INT, call_data->caret,
1317 DT_INT, call_data->chg_first,
1318 DT_INT, call_data->chg_length,
1319 DT_END));
1320}
1321
1322#if 0
1323static void
1324xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1325{
1326 ((rxvt_term *)client_data)->make_current ();
1327 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1328 DT_INT, call_data->position,
1329 DT_INT, call_data->direction,
1330 DT_INT, call_data->style,
1331 DT_END));
1332}
1333#endif
1334
1335#endif
1387 1336
1388/* 1337/*
1389 * Try to open a XIM with the current modifiers, then see if we can 1338 * Try to open a XIM with the current modifiers, then see if we can
1390 * open a suitable preedit type 1339 * open a suitable preedit type
1391 */ 1340 */
… …
1398 XRectangle rect, status_rect, needed_rect; 1347 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1348 unsigned long fg, bg;
1400 const char *p; 1349 const char *p;
1401 char **s; 1350 char **s;
1402 XIMStyles *xim_styles; 1351 XIMStyles *xim_styles;
1352#ifdef ENABLE_XIM_ONTHESPOT
1353 XIMCallback xcb[4];
1354#endif
1403 1355
1404 set_environ (envv); 1356 set_environ (envv);
1405 1357
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1358 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1359 return false;
1408 1360
1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410 input_method = display->get_xim (locale, modifiers); 1361 input_method = display->get_xim (locale, modifiers);
1411 if (input_method == NULL) 1362 if (input_method == NULL)
1412 return false; 1363 return false;
1413 1364
1414 xim = input_method->xim; 1365 xim = input_method->xim;
… …
1434 s = rxvt_splitcommastring (p); 1385 s = rxvt_splitcommastring (p);
1435 1386
1436 for (i = found = 0; !found && s[i]; i++) 1387 for (i = found = 0; !found && s[i]; i++)
1437 { 1388 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1389 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = XIMPreeditPosition | XIMStatusNothing;
1440 else if (!strcmp (s[i], "OffTheSpot")) 1391 else if (!strcmp (s[i], "OffTheSpot"))
1441 input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = XIMPreeditArea | XIMStatusArea;
1442 else if (!strcmp (s[i], "Root")) 1393 else if (!strcmp (s[i], "Root"))
1443 input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = XIMPreeditNothing | XIMStatusNothing;
1444 else if (!strcmp (s[i], "None")) 1395 else if (!strcmp (s[i], "None"))
1445 input_style = (XIMPreeditNone | XIMStatusNone); 1396 input_style = XIMPreeditNone | XIMStatusNone;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1399 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1400#endif
1401 else
1402 input_style = XIMPreeditNothing | XIMStatusNothing;
1446 1403
1447 for (j = 0; j < xim_styles->count_styles; j++) 1404 for (j = 0; j < xim_styles->count_styles; j++)
1448 if (input_style == xim_styles->supported_styles[j]) 1405 if (input_style == xim_styles->supported_styles[j])
1449 { 1406 {
1450 rxvt_freecommastring (s); 1407 rxvt_freecommastring (s);
… …
1488 "*", 1445 "*",
1489 fheight, 1446 fheight,
1490 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1491 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1492 1449
1493 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1494 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1495 1452
1496 if (missing_charset_list) 1453 if (missing_charset_list)
1497 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1498 1455
… …
1539 XNBackground, bg, 1496 XNBackground, bg,
1540 XNArea, &status_rect, 1497 XNArea, &status_rect,
1541 XNFontSet, fs, 1498 XNFontSet, fs,
1542 NULL); 1499 NULL);
1543 } 1500 }
1501#if ENABLE_XIM_ONTHESPOT
1502 else if (input_style & XIMPreeditCallbacks)
1503 {
1504 im_set_position (spot);
1505
1506 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1507 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1508 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1509# if 0
1510 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1511# endif
1512
1513 preedit_attr = XVaCreateNestedList (0,
1514 XNSpotLocation, &spot,
1515 XNPreeditStartCallback, &xcb[0],
1516 XNPreeditDoneCallback , &xcb[1],
1517 XNPreeditDrawCallback , &xcb[2],
1518# if 0
1519 XNPreeditCaretCallback, &xcb[3],
1520# endif
1521 NULL);
1522 }
1523#endif
1544 1524
1545 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1546 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1547 XNClientWindow, vt, 1527 XNClientWindow, vt,
1548 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1550 preedit_attr, 1530 preedit_attr,
1551 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1552 status_attr, NULL); 1532 status_attr, NULL);
1553 1533
1554 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1555 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1556 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1557 1537
1558 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1559 { 1539 {
1560 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561 im_destroy (); 1541 im_destroy ();
1562 return false; 1542 return false;
1563 } 1543 }
1564 1544
1565 if (input_style & XIMPreeditArea) 1545#if 0
1546 // unfortunately, only the focus window is used by XIM, hard to fix
1547 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1548 vt_select_input ();
1549#endif
1550
1566 IMSetStatusPosition (); 1551 IMSetPosition ();
1567 1552
1568 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569 return true; 1553 return true;
1570} 1554}
1571 1555
1572void 1556void
1573rxvt_term::im_cb () 1557rxvt_term::im_cb ()
… …
1579 1563
1580 make_current (); 1564 make_current ();
1581 1565
1582 im_destroy (); 1566 im_destroy ();
1583 1567
1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585 if (Input_Context) 1568 if (Input_Context)
1586 return; 1569 return;
1587 1570
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
… …
1631 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1632#endif 1615#endif
1633} 1616}
1634 1617
1635void 1618void
1636rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1637{ 1620{
1638 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1639 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1640 1623
1641 if (!Input_Context 1624 if (!Input_Context
1642 || !focus 1625 || !focus
1643 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1644 || !IMisRunning ()) 1627 || !IMisRunning ())
1645 return; 1628 return;
1646 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1647 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1648 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1649 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1650 XFree (status_attr); 1643 XFree (status_attr);
1651 1644
1652 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1653 XFree (needed_rect); 1646 XFree (needed_rect);
1654 1647
1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1656 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1657 1650
1658 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1659 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1660 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1661 1655
1656 XFree (status_attr);
1657 }
1658
1662 XFree (preedit_attr); 1659 XFree (preedit_attr);
1663 XFree (status_attr);
1664} 1660}
1665#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1666 1662
1667/*----------------------------------------------------------------------*/
1668rxvt_t rxvt_current_term;
1669
1670/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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