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.186 by root, Tue Jan 17 15:41:33 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
208 pty_ev.stop ();
214 delete pty; pty = 0; 209 delete pty; pty = 0;
215} 210}
216 211
217rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
218{ 213{
219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
221 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
222 215
223 emergency_cleanup (); 216 emergency_cleanup ();
224 217
225#if ENABLE_STYLES 218#if ENABLE_STYLES
… …
229#endif 222#endif
230 delete fontset[0]; 223 delete fontset[0];
231 224
232 if (display) 225 if (display)
233 { 226 {
234 dDisp;
235
236 selection_clear (); 227 selection_clear ();
237 228
238#ifdef USE_XIM 229#ifdef USE_XIM
239 im_destroy (); 230 im_destroy ();
240#endif 231#endif
241#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif 235#endif
245#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif 238#endif
248#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif 250#endif
260#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif 255#endif
265 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
266 257
267 delete drawable; 258 delete drawable;
268 // destroy all windows 259 // destroy all windows
269 if (parent[0]) 260 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
271 }
272 262
273 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
274 delete pix_colors_focused; 264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
275#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
276 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
277#endif 278#endif
278 279
279 displays.put (display); 280 displays.put (display);
280 281
281 scr_release (); 282 scr_release ();
… …
284 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
285 free (allocated [i]); 286 free (allocated [i]);
286 287
287 free (selection.text); 288 free (selection.text);
288 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
289 free (env_windowid);
290 free (env_display); 290 free (env_display);
291 free (env_term); 291 free (env_term);
292 free (env_colorfgbg);
293 free (locale); 292 free (locale);
294 free (v_buffer); 293 free (v_buffer);
295 free (incr_buf); 294 free (incr_buf);
296 295
297 delete envv; 296 delete envv;
… …
300#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
301 delete keyboard; 300 delete keyboard;
302#endif 301#endif
303} 302}
304 303
304// child has exited, usually destroys
305void 305void
306rxvt_term::child_exit () 306rxvt_term::child_cb (child_watcher &w, int status)
307{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
308 cmd_pid = 0; 310 cmd_pid = 0;
309 311
310 if (!OPTION (Opt_hold)) 312 if (!OPTION (Opt_hold))
311 destroy (); 313 destroy ();
312} 314}
… …
315rxvt_term::destroy () 317rxvt_term::destroy ()
316{ 318{
317 if (destroy_ev.active) 319 if (destroy_ev.active)
318 return; 320 return;
319 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
320#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
321 scr_overlay_off (); 325 scr_overlay_off ();
322#endif 326#endif
323 327
324 if (display) 328 if (display)
… …
327 im_ev.stop (display); 331 im_ev.stop (display);
328#endif 332#endif
329#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
330 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
331#endif 335#endif
332#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
333 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
334#endif 338#endif
335 incr_ev.stop (); 339 incr_ev.stop ();
336 termwin_ev.stop (display); 340 termwin_ev.stop (display);
337 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
378{ 382{
379 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++)
380 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
381} 385}
382 386
383#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
384static void 388static void
385print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
386{ 390{
387 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
436 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
437 else 441 else
438 { 442 {
439 // 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,
440 // so just output the error and continue 444 // so just output the error and continue
441#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
442 print_x_error (display, event); 448 print_x_error (display, event);
443#else
444 old_xerror_handler (display, event);
445#endif 449#endif
446 } 450 }
447 451
448 return 0; 452 return 0;
449} 453}
… …
457 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
458} 462}
459 463
460/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
461bool 465bool
462rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
463{ 467{
468 this->envv = envv;
469
464 SET_R (this); 470 SET_R (this);
465 set_locale (""); 471 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :( 472 set_environ (envv); // few things in X do not call setlocale :(
467 473
468 if (!init_vars ()) 474 if (!init_vars ())
… …
479#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 486 if (OPTION (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 488#endif
483 489
484#if ENABLE_PERL 490 pty = ptytty::create ();
485 if (!rs[Rs_perl_ext_1])
486 rs[Rs_perl_ext_1] = "default";
487
488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491 {
492#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493 // ignore some perl-related arguments if some bozo installed us set[ug]id
494 if (rxvt_tainted ())
495 {
496 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500 rs[Rs_perl_lib] = 0;
501 rs[Rs_perl_eval] = 0;
502 }
503 }
504#endif
505 rxvt_perl.init (this);
506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507 }
508#endif
509
510 pty = rxvt_new_ptytty ();
511 491
512 create_windows (argc, argv); 492 create_windows (argc, argv);
513 493
514 dDisp;
515
516 init_xlocale (); 494 init_xlocale ();
517 495
518 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
519 497
520#if 0 498#if 0
521 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
522#endif 500#endif
523 501
524#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
525 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
526 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
527#endif 505#endif
528#ifdef TRANSPARENT 506#ifdef TRANSPARENT
529 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
530 { 508 {
531 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
532 check_our_parents (); 510 check_our_parents ();
533 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
534 } 512 }
535#endif 513#endif
536 514#if ENABLE_PERL
537 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
538 XMapWindow (disp, parent[0]); 516#endif
539 517
540 set_colorfgbg (); 518 set_colorfgbg ();
541 519
542 init_command (cmd_argv); 520 init_command (cmd_argv);
543 521
… …
548 526
549 check_ev.start (); 527 check_ev.start ();
550 528
551 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
552 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
553 return true; 544 return true;
554} 545}
555 546
556static struct sig_handlers 547static struct sig_handlers
557{ 548{
558 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
559 550
560 void sig_chld (sig_watcher &w)
561 {
562 // we are being called for every SIGCHLD, find the corresponding term
563 int pid;
564
565 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
566 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
567 if (pid == (*t)->cmd_pid)
568 {
569 (*t)->child_exit ();
570 break;
571 }
572 }
573
574 /* 551 /*
575 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
576 */ 553 */
577 void 554 void
578 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
579 { 556 {
580#ifdef DEBUG_CMD
581 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582#endif
583 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
584 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
585 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
586 } 560 }
587 561
588 sig_handlers () 562 sig_handlers ()
589 : sw_chld (this, &sig_handlers::sig_chld),
590 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
591 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
592 { 565 {
593 } 566 }
594} sig_handlers; 567} sig_handlers;
595 568
596char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
597 570
598void 571void
599rxvt_init () 572rxvt_init ()
600{ 573{
601 uid_t uid = getuid (); 574 ptytty::init ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615
616 // drop privileges
617#if HAVE_SETRESUID
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632 575
633 rxvt_environ = environ; 576 rxvt_environ = environ;
634
635 /*
636 * Save and then give up any super-user privileges
637 * If we need privileges in any area then we must specifically request it.
638 * We should only need to be root in these cases:
639 * 1. write utmp entries on some systems
640 * 2. chown tty on some systems
641 */
642 rxvt_privileges (SAVE);
643 rxvt_privileges (IGNORE);
644 577
645 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
647 580
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
650 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
651 583
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
… …
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
683 615
684 return p; 616 return p;
685} 617}
686 618
687void * 619void *
688rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
689{ 621{
690 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
691 623
692 if (!p) 624 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
694 626
695 return p; 627 return p;
696}
697
698/* ------------------------------------------------------------------------- *
699 * PRIVILEGED OPERATIONS *
700 * ------------------------------------------------------------------------- */
701/* take care of suid/sgid super-user (root) privileges */
702void
703rxvt_privileges (rxvt_privaction action)
704{
705#if ! defined(__CYGWIN32__)
706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707 /* setreuid () is the poor man's setuid (), seteuid () */
708# define seteuid(a) setreuid(-1, (a))
709# define setegid(a) setregid(-1, (a))
710# define HAVE_SETEUID
711# endif
712# ifdef HAVE_SETEUID
713 switch (action)
714 {
715 case IGNORE:
716 /*
717 * change effective uid/gid - not real uid/gid - so we can switch
718 * back to root later, as required
719 */
720 setegid (getgid ());
721 seteuid (getuid ());
722 break;
723 case SAVE:
724 saved_egid = getegid ();
725 saved_euid = geteuid ();
726 break;
727 case RESTORE:
728 setegid (saved_egid);
729 seteuid (saved_euid);
730 break;
731 }
732# else
733 switch (action)
734 {
735 case IGNORE:
736 setgid (getgid ());
737 setuid (getuid ());
738 /* FALLTHROUGH */
739 case SAVE:
740 /* FALLTHROUGH */
741 case RESTORE:
742 break;
743 }
744# endif
745#endif
746} 628}
747 629
748/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
749/* 631/*
750 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
… …
755{ 637{
756 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
757 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
758 unsigned int w, h; 640 unsigned int w, h;
759 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
760 dDisp;
761
762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
763 ncol, nrow, szHint.width, szHint.height));
764 642
765 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
766 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
767 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768 646
… …
830 708
831 if (scrollBar.state) 709 if (scrollBar.state)
832 { 710 {
833 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
834 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
835 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
836 window_vt_x += sb_w; 715 window_vt_x += sb_w;
837 } 716 }
838 717
839 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
840 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
841 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
842 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
843 722
844 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
845 { 724 {
846 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
865 744
866 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
867 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
868 747
869 if (recalc_x) 748 if (recalc_x)
870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
871 if (recalc_y) 751 if (recalc_y)
872 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
873 753
874 ncol = width / fwidth; 754 ncol = width / fwidth;
875 nrow = height / fheight; 755 nrow = height / fheight;
876 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
877 ncol, nrow, szHint.width,
878 szHint.height));
879 return;
880} 756}
881 757
882/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
883/* 759/*
884 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
… …
936 delete fontset[0]; 812 delete fontset[0];
937 fontset[0] = fs; 813 fontset[0] = fs;
938 814
939 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
940 prop.height += lineSpace; 816 prop.height += lineSpace;
817
941 fs->set_prop (prop); 818 fs->set_prop (prop, false);
942 819
943 fwidth = prop.width; 820 fwidth = prop.width;
944 fheight = prop.height; 821 fheight = prop.height;
945 fbase = prop.ascent; 822 fbase = prop.ascent;
946 823
… …
955 { 832 {
956 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
957 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
958 835
959 if (res) 836 if (res)
960 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
961 else 841 else
962 { 842 {
963 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
964 844
965 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;
966 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);
967 } 849 }
968 850
969 fs->populate (res);
970 fs->set_prop (prop2);
971 } 851 }
972#else 852#else
973 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
974#endif 854#endif
975 } 855 }
… …
984 return true; 864 return true;
985} 865}
986 866
987void 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)
988{ 868{
989 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
990 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
991 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
992} 872}
993 873
994void 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)
995{ 875{
996 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
997 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
998 878
999 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
1000 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1001 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
1002 882
1003 free (s); 883 free (s);
1004 free (ws); 884 free (ws);
… …
1029void 909void
1030rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
1031{ 911{
1032 rxvt_color xcol; 912 rxvt_color xcol;
1033 int i; 913 int i;
1034 914
1035 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
1036 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
1037 921
1038 /* handle color aliases */ 922 /* handle color aliases */
1039 if (isdigit (*color)) 923 if (isdigit (*color))
1040 { 924 {
1041 i = atoi (color); 925 i = atoi (color);
1042 926
1043 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 928 { /* bright colors */
1045 i -= 8; 929 i -= 8;
1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1047 SET_PIXCOLOR (idx);
1048 goto done; 931 goto done;
1049 } 932 }
1050 933
1051 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
1052 { /* normal colors */ 935 { /* normal colors */
1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1054 SET_PIXCOLOR (idx);
1055 goto done; 937 goto done;
1056 } 938 }
1057 } 939 }
1058 940
1059 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
1060 return;
1061
1062 /* XStoreColor (display->display, display->cmap, XColor*); */
1063 942
1064 /* 943 /*
1065 * 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,
1066 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
1067 */ 946 */
1068# if 0
1069 for (i = Color_Black; i <= Color_White; i++)
1070 if (pix_colors[idx] == pix_colors[i])
1071 break;
1072 if (i > Color_White)
1073 {
1074 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1075 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1076 DisplayPlanes (display->display, display->screen));
1077 }
1078# endif
1079 947
1080 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
1081 SET_PIXCOLOR (idx);
1082 949
1083 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
1084 /* Cursor cursor; */ 951 /* Cursor cursor; */
1085done: 952done:
1086
1087#if OFF_FOCUS_FADING
1088 if (rs[Rs_fade])
1089 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1090#endif
1091
1092 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
1093 954
955 update_fade_color (idx);
1094 recolour_cursor (); 956 recolour_cursor ();
1095 scr_recolour (); 957 scr_recolour ();
1096} 958}
1097 959
1098#else 960#else
… …
1100#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
1101 963
1102void 964void
1103rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
1104{ 966{
1105 XColor xcol[2]; 967 XColor fg, bg;
1106 968
1107 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
1108 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
1109 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
1110 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
1111 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
1112 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
1113 976
1114 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1115 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1116} 978}
1117 979
1118/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1119/* 981/*
1120 * 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
… …
1124{ 986{
1125 unsigned int i; 987 unsigned int i;
1126 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1127 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1128 990
1129 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1130 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1131 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1132 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1133 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1134 { 995 {
… …
1149 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1150} 1011}
1151 1012
1152/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1153 1014
1154int 1015bool
1155rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1156{ 1017{
1157 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1158 {
1159 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1160 return false;
1161 }
1162
1163 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]);
1164} 1029}
1165 1030
1166/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1167 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1168 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
1169void 1034void
1170rxvt_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)
1171{ 1036{
1172 int fix_screen; 1037 int fix_screen;
1173 int old_width = szHint.width, old_height = szHint.height; 1038 int old_width = szHint.width;
1174 dDisp; 1039 int old_height = szHint.height;
1175 1040
1176 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)))
1177 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1178 1045
1179 if (!ignoreparent) 1046 if (!ignoreparent)
1180 { 1047 {
1181#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1182 /* 1049 /*
… …
1186 int x, y, x1, y1; 1053 int x, y, x1, y1;
1187 int dx, dy; 1054 int dx, dy;
1188 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1189 Window unused_cr; 1056 Window unused_cr;
1190 1057
1191 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1192 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1193 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1194 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1195 /* 1062 /*
1196 * 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
1197 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1198 */ 1065 */
… …
1200 { 1067 {
1201 x -= x1; 1068 x -= x1;
1202 y -= y1; 1069 y -= y1;
1203 } 1070 }
1204 1071
1205 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1206 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1207 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1208 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1209 1076
1210 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1211 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
1212 dx = 0; 1079 dx = 0;
… …
1215 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1216 dy = 0; 1083 dy = 0;
1217 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1218 dy /= 2; 1085 dy /= 2;
1219 1086
1220 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1221 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1222#else 1089#else
1223 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1224#endif 1091#endif
1225 } 1092 }
1226 1093
1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1228 1095
1229 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1230 { 1097 {
1231 if (scrollBar.state) 1098 if (scrollBar.state)
1232 { 1099 {
1233 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1234 window_sb_x, 0, 1101 window_sb_x, 0,
1235 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1236 resize_scrollbar (); 1103 resize_scrollbar ();
1237 } 1104 }
1238 1105
1239 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1240 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1241 width, height); 1108 width, height);
1242 1109
1243 scr_clear (); 1110 scr_clear ();
1244#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1245 resize_pixmap (); 1112 resize_pixmap ();
1246#endif 1113#endif
1247 } 1114 }
1248 1115
1249 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1250 {
1251 int curr_screen = -1;
1252 int old_ncol = prev_ncol;
1253
1254 /* scr_reset only works on the primary screen */
1255 if (old_height) /* this is not the first time through */
1256 {
1257 unsigned int ocol = ncol;
1258 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1259 curr_screen = scr_change_screen (PRIMARY);
1260 ncol = ocol;
1261 }
1262
1263 scr_reset (); 1117 scr_reset ();
1264 1118
1265 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
1266 { 1120 //scr_touch (false);
1267 scr_change_screen (curr_screen);
1268 selection_check (old_ncol != ncol ? 4 : 0);
1269 }
1270 }
1271
1272 old_width = szHint.width;
1273 old_height = szHint.height;
1274 1121
1275#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1276 if (pixmap) 1123 if (pixmap)
1277 scr_touch (false); 1124 scr_touch (false);
1278#endif 1125#endif
1279 1126
1280#ifdef USE_XIM 1127#ifdef USE_XIM
1281 IMSetStatusPosition (); 1128 IMSetPosition ();
1282#endif 1129#endif
1283} 1130}
1284 1131
1285/* 1132/*
1286 * 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.
… …
1291{ 1138{
1292 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1293 1140
1294 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1295 { 1142 {
1296 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1297 1144
1298 if (newwidth == 0) 1145 if (newwidth == 0)
1299 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1300 if (newheight == 0) 1147 if (newheight == 0)
1301 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1315#ifdef USE_XIM 1162#ifdef USE_XIM
1316 1163
1317void 1164void
1318rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1319{ 1166{
1320 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1321 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1322} 1169}
1323 1170
1324void 1171void
1325rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1326{ 1173{
… …
1363 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1364 1211
1365 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1366 *p = '\0'; 1213 *p = '\0';
1367 1214
1368 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1369 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1370 1217
1371 if (win != None) 1218 if (win != None)
1372 return True; 1219 return True;
1373 } 1220 }
1374 1221
… …
1381 XPoint nspot; 1228 XPoint nspot;
1382 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1383 1230
1384 if (!Input_Context 1231 if (!Input_Context
1385 || !focus 1232 || !focus
1386 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1387 return; 1234 return;
1388 1235
1389 im_set_position (nspot); 1236 im_set_position (nspot);
1390 1237
1391 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1410 input_method = 0; 1257 input_method = 0;
1411 } 1258 }
1412 1259
1413 Input_Context = 0; 1260 Input_Context = 0;
1414} 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
1415 1336
1416/* 1337/*
1417 * 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
1418 * open a suitable preedit type 1339 * open a suitable preedit type
1419 */ 1340 */
… …
1426 XRectangle rect, status_rect, needed_rect; 1347 XRectangle rect, status_rect, needed_rect;
1427 unsigned long fg, bg; 1348 unsigned long fg, bg;
1428 const char *p; 1349 const char *p;
1429 char **s; 1350 char **s;
1430 XIMStyles *xim_styles; 1351 XIMStyles *xim_styles;
1352#ifdef ENABLE_XIM_ONTHESPOT
1353 XIMCallback xcb[4];
1354#endif
1431 1355
1432 set_environ (envv); 1356 set_environ (envv);
1433 1357
1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1358 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435 return false; 1359 return false;
1436 1360
1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438 input_method = display->get_xim (locale, modifiers); 1361 input_method = display->get_xim (locale, modifiers);
1439 if (input_method == NULL) 1362 if (input_method == NULL)
1440 return false; 1363 return false;
1441 1364
1442 xim = input_method->xim; 1365 xim = input_method->xim;
… …
1462 s = rxvt_splitcommastring (p); 1385 s = rxvt_splitcommastring (p);
1463 1386
1464 for (i = found = 0; !found && s[i]; i++) 1387 for (i = found = 0; !found && s[i]; i++)
1465 { 1388 {
1466 if (!strcmp (s[i], "OverTheSpot")) 1389 if (!strcmp (s[i], "OverTheSpot"))
1467 input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = XIMPreeditPosition | XIMStatusNothing;
1468 else if (!strcmp (s[i], "OffTheSpot")) 1391 else if (!strcmp (s[i], "OffTheSpot"))
1469 input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = XIMPreeditArea | XIMStatusArea;
1470 else if (!strcmp (s[i], "Root")) 1393 else if (!strcmp (s[i], "Root"))
1471 input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = XIMPreeditNothing | XIMStatusNothing;
1472 else if (!strcmp (s[i], "None")) 1395 else if (!strcmp (s[i], "None"))
1473 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;
1474 1403
1475 for (j = 0; j < xim_styles->count_styles; j++) 1404 for (j = 0; j < xim_styles->count_styles; j++)
1476 if (input_style == xim_styles->supported_styles[j]) 1405 if (input_style == xim_styles->supported_styles[j])
1477 { 1406 {
1478 rxvt_freecommastring (s); 1407 rxvt_freecommastring (s);
… …
1516 "*", 1445 "*",
1517 fheight, 1446 fheight,
1518 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1519 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1520 1449
1521 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1522 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1523 1452
1524 if (missing_charset_list) 1453 if (missing_charset_list)
1525 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1526 1455
… …
1567 XNBackground, bg, 1496 XNBackground, bg,
1568 XNArea, &status_rect, 1497 XNArea, &status_rect,
1569 XNFontSet, fs, 1498 XNFontSet, fs,
1570 NULL); 1499 NULL);
1571 } 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
1572 1524
1573 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1574 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1575 XNClientWindow, vt, 1527 XNClientWindow, vt,
1576 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1578 preedit_attr, 1530 preedit_attr,
1579 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1580 status_attr, NULL); 1532 status_attr, NULL);
1581 1533
1582 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1583 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1584 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1585 1537
1586 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1587 { 1539 {
1588 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589 im_destroy (); 1541 im_destroy ();
1590 return false; 1542 return false;
1591 } 1543 }
1592 1544
1593 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
1594 IMSetStatusPosition (); 1551 IMSetPosition ();
1595 1552
1596 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597 return true; 1553 return true;
1598} 1554}
1599 1555
1600void 1556void
1601rxvt_term::im_cb () 1557rxvt_term::im_cb ()
… …
1607 1563
1608 make_current (); 1564 make_current ();
1609 1565
1610 im_destroy (); 1566 im_destroy ();
1611 1567
1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613 if (Input_Context) 1568 if (Input_Context)
1614 return; 1569 return;
1615 1570
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
… …
1659 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1660#endif 1615#endif
1661} 1616}
1662 1617
1663void 1618void
1664rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1665{ 1620{
1666 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1667 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1668 1623
1669 if (!Input_Context 1624 if (!Input_Context
1670 || !focus 1625 || !focus
1671 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1672 || !IMisRunning ()) 1627 || !IMisRunning ())
1673 return; 1628 return;
1674 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 {
1675 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1676 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1677 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1678 XFree (status_attr); 1643 XFree (status_attr);
1679 1644
1680 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1681 XFree (needed_rect); 1646 XFree (needed_rect);
1682 1647
1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1684 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1685 1650
1686 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1688 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1689 1655
1656 XFree (status_attr);
1657 }
1658
1690 XFree (preedit_attr); 1659 XFree (preedit_attr);
1691 XFree (status_attr);
1692} 1660}
1693#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1694 1662
1695/*----------------------------------------------------------------------*/
1696rxvt_t rxvt_current_term;
1697
1698/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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