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.179 by root, Mon Jan 16 08:48:09 2006 UTC vs.
Revision 1.216 by root, Wed Feb 1 21:15:33 2006 UTC

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

Diff Legend

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