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.174 by root, Thu Jan 12 00:11:13 2006 UTC vs.
Revision 1.220 by root, Sat Feb 11 10:53:37 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
73 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
74 return false; 62 return false;
75 63
76 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
78 return true; 66 return true;
79} 67}
80 68
81void 69void
82rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
83{ 71{
84 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
86} 74}
87 75
88void 76void
89rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
90{ 78{
91 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
92} 80}
93 81
94#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
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 (dpy, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
254#endif 229#endif
255#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
256 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
257#endif 232#endif
258#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
259 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
260 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
261 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
262 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
263 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
264 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
265 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, 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 (dpy, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
274#endif 249#endif
275 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (dpy, 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 (dpy, 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 ();
… …
377} 357}
378 358
379void 359void
380rxvt_term::destroy_cb (time_watcher &w) 360rxvt_term::destroy_cb (time_watcher &w)
381{ 361{
382 SET_R (this); 362 make_current ();
383 363
384 delete this; 364 delete this;
385} 365}
386 366
387/*----------------------------------------------------------------------*/ 367/*----------------------------------------------------------------------*/
… …
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);
465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
483 467
484 const char **cmd_argv; 468 if (!init_vars ())
469 return false;
470
471 init_secondary ();
472
473 const char **cmd_argv = init_resources (argc, argv);
474
475#ifdef KEYSYM_RESOURCE
476 keyboard->register_done ();
477#endif
478
479#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */
482#endif
483
484 pty = ptytty::create ();
485
486 create_windows (argc, argv);
487
488 init_xlocale ();
489
490 scr_reset (); // initialize screen
491
492#if 0
493 XSynchronize (dpy, True);
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */
499#endif
500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent))
502 {
503 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root);
506 }
507#endif
508
509 set_colorfgbg ();
510
511 init_command (cmd_argv);
512
513 free (cmd_argv);
514
515 if (pty->pty >= 0)
516 pty_ev.start (pty->pty, EVENT_READ);
517
518 check_ev.start ();
519
520 HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (dpy, vt);
533 XMapWindow (dpy, parent[0]);
534
535 return true;
536}
537
538static struct sig_handlers
539{
540 sig_watcher sw_term, sw_int;
485 541
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
489 set_locale ("");
490
491 if (!init_vars ())
492 return false;
493
494 init_secondary ();
495
496 cmd_argv = init_resources (argc, argv);
497
498#ifdef KEYSYM_RESOURCE
499 keyboard->register_done ();
500#endif
501
502#if MENUBAR_MAX
503 menubar_read (rs[Rs_menu]);
504#endif
505#ifdef HAVE_SCROLLBARS
506 if (OPTION (Opt_scrollBar))
507 scrollBar.setIdle (); /* set existence for size calculations */
508#endif
509 }
510
511#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default";
514
515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
518 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535 }
536#endif
537
538 {
539 TEMP_ENV;
540
541 create_windows (argc, argv);
542
543 dDisp;
544
545 init_xlocale ();
546
547 scr_reset (); // initialize screen
548
549#if 0
550 XSynchronize (disp, True);
551#endif
552
553#ifdef HAVE_SCROLLBARS
554 if (OPTION (Opt_scrollBar))
555 resize_scrollbar (); /* create and map scrollbar */
556#endif
557#if (MENUBAR_MAX)
558 if (menubar_visible ())
559 XMapWindow (disp, menuBar.win);
560#endif
561#ifdef TRANSPARENT
562 if (OPTION (Opt_transparent))
563 {
564 XSelectInput (disp, display->root, PropertyChangeMask);
565 check_our_parents ();
566 rootwin_ev.start (display, display->root);
567 }
568#endif
569
570 XMapWindow (disp, vt);
571 XMapWindow (disp, parent[0]);
572
573 set_colorfgbg ();
574
575 init_command (cmd_argv);
576
577 free (cmd_argv);
578
579 if (pty.pty >= 0)
580 pty_ev.start (pty.pty, EVENT_READ);
581
582 check_ev.start ();
583
584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
586
587 return true;
588}
589
590static struct sig_handlers
591{
592 sig_watcher sw_chld, sw_term, sw_int;
593
594 void sig_chld (sig_watcher &w)
595 {
596 // we are being called for every SIGCHLD, find the corresponding term
597 int pid;
598
599 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
600 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
601 if (pid == (*t)->cmd_pid)
602 {
603 (*t)->child_exit ();
604 break;
605 }
606 }
607
608 /* 542 /*
609 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
610 */ 544 */
611 void 545 void
612 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
613 { 547 {
614#ifdef DEBUG_CMD
615 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
616#endif
617 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
618 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
619 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
620 } 551 }
621 552
622 sig_handlers () 553 sig_handlers ()
623 : sw_chld (this, &sig_handlers::sig_chld),
624 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
625 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
626 { 556 {
627 } 557 }
628} sig_handlers; 558} sig_handlers;
629 559
560char **rxvt_environ; // startup environment
561
630void 562void
631rxvt_init () 563rxvt_init ()
632{ 564{
633 /* 565 ptytty::init ();
634 * Save and then give up any super-user privileges 566
635 * If we need privileges in any area then we must specifically request it. 567 rxvt_environ = environ;
636 * We should only need to be root in these cases:
637 * 1. write utmp entries on some systems
638 * 2. chown tty on some systems
639 */
640 rxvt_privileges (SAVE);
641 rxvt_privileges (IGNORE);
642 568
643 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
644 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
645 571
646 sig_handlers.sw_chld.start (SIGCHLD);
647 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
648 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
649 574
650 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
651 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
… …
680 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
681 606
682 return p; 607 return p;
683} 608}
684 609
685void * 610void *
686rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
687{ 612{
688 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
689 614
690 if (!p) 615 if (!p)
691 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
692 617
693 return p; 618 return p;
694} 619}
695
696/* ------------------------------------------------------------------------- *
697 * PRIVILEGED OPERATIONS *
698 * ------------------------------------------------------------------------- */
699/* take care of suid/sgid super-user (root) privileges */
700void
701rxvt_privileges (rxvt_privaction action)
702{
703#if ! defined(__CYGWIN32__)
704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
705 /* setreuid () is the poor man's setuid (), seteuid () */
706# define seteuid(a) setreuid(-1, (a))
707# define setegid(a) setregid(-1, (a))
708# define HAVE_SETEUID
709# endif
710# ifdef HAVE_SETEUID
711 switch (action)
712 {
713 case IGNORE:
714 /*
715 * change effective uid/gid - not real uid/gid - so we can switch
716 * back to root later, as required
717 */
718 setegid (getgid ());
719 seteuid (getuid ());
720 break;
721 case SAVE:
722 saved_egid = getegid ();
723 saved_euid = geteuid ();
724 break;
725 case RESTORE:
726 setegid (saved_egid);
727 seteuid (saved_euid);
728 break;
729 }
730# else
731 switch (action)
732 {
733 case IGNORE:
734 setgid (getgid ());
735 setuid (getuid ());
736 /* FALLTHROUGH */
737 case SAVE:
738 /* FALLTHROUGH */
739 case RESTORE:
740 break;
741 }
742# endif
743#endif
744}
745
746#ifdef UTMP_SUPPORT
747void
748rxvt_term::privileged_utmp (rxvt_privaction action)
749{
750 if (OPTION (Opt_utmpInhibit)
751 || !pty.name || !*pty.name)
752 return;
753
754 rxvt_privileges (RESTORE);
755
756 if (action == SAVE)
757 makeutent (pty.name, rs[Rs_display_name]);
758 else
759 cleanutent ();
760
761 rxvt_privileges (IGNORE);
762}
763#endif
764 620
765/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
766/* 622/*
767 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
768 * if width/height are non-zero then override calculated width/height 624 * if width/height are non-zero then override calculated width/height
769 */ 625 */
770void 626void
771rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
772{ 628{
773 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
774 int x, y, sb_w, mb_h, flags; 630 int x, y, sb_w, flags;
775 unsigned int w, h; 631 unsigned int w, h;
776 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
777 dDisp;
778
779 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
780 ncol, nrow, szHint.width, szHint.height));
781 633
782 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
783 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
784 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
785 637
… …
840 max_width = MAX_COLS * fwidth; 692 max_width = MAX_COLS * fwidth;
841 max_height = MAX_ROWS * fheight; 693 max_height = MAX_ROWS * fheight;
842 694
843 szHint.base_width = szHint.base_height = 2 * int_bwidth; 695 szHint.base_width = szHint.base_height = 2 * int_bwidth;
844 696
845 sb_w = mb_h = 0; 697 sb_w = 0;
846 window_vt_x = window_vt_y = int_bwidth; 698 window_vt_x = window_vt_y = int_bwidth;
847 699
848 if (scrollbar_visible ()) 700 if (scrollBar.state)
849 { 701 {
850 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
851 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
852 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
853 window_vt_x += sb_w; 706 window_vt_x += sb_w;
854 } 707 }
855 708
856 if (menubar_visible ())
857 {
858 mb_h = menuBar_TotalHeight ();
859 szHint.base_height += mb_h;
860 window_vt_y += mb_h;
861 }
862
863 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
864 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
865 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
866 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
867 713
868 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
869 { 715 {
870 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
885 { 731 {
886 min_it (height, max_height); 732 min_it (height, max_height);
887 szHint.height = szHint.base_height + height; 733 szHint.height = szHint.base_height + height;
888 } 734 }
889 735
890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
891 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
892 738
893 if (recalc_x) 739 if (recalc_x)
894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
895 if (recalc_y) 742 if (recalc_y)
896 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
897 744
898 ncol = width / fwidth; 745 ncol = width / fwidth;
899 nrow = height / fheight; 746 nrow = height / fheight;
900 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
901 ncol, nrow, szHint.width,
902 szHint.height));
903 return;
904} 747}
905 748
906/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
907/* 750/*
908 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
909 * Called after a window size change. 752 * Called after a window size change.
910 */ 753 */
911void 754void
912rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
913{ 756{
914 if (pty.pty < 0) 757 if (pty->pty < 0)
915 return; 758 return;
916 759
917 struct winsize ws; 760 struct winsize ws;
918 761
919 ws.ws_col = ncol; 762 ws.ws_col = ncol;
920 ws.ws_row = nrow; 763 ws.ws_row = nrow;
921 ws.ws_xpixel = width; 764 ws.ws_xpixel = width;
922 ws.ws_ypixel = height; 765 ws.ws_ypixel = height;
923 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
924 767
925#if 0 768#if 0
926 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
927 if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
928 kill (-cmd_pid, SIGWINCH); 771 kill (-cmd_pid, SIGWINCH);
… …
1008 return true; 851 return true;
1009} 852}
1010 853
1011void 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)
1012{ 855{
1013 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
1014 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
1015 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1016} 859}
1017 860
1018void 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)
1019{ 862{
1020 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
1021 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
1022 865
1023 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
1024 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1025 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
1026 869
1027 free (s); 870 free (s);
1028 free (ws); 871 free (ws);
… …
1053void 896void
1054rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
1055{ 898{
1056 rxvt_color xcol; 899 rxvt_color xcol;
1057 int i; 900 int i;
1058 901
1059 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
1060 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
1061 908
1062 /* handle color aliases */ 909 /* handle color aliases */
1063 if (isdigit (*color)) 910 if (isdigit (*color))
1064 { 911 {
1065 i = atoi (color); 912 i = atoi (color);
1066 913
1067 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
1068 { /* bright colors */ 915 { /* bright colors */
1069 i -= 8; 916 i -= 8;
1070 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1071 SET_PIXCOLOR (idx);
1072 goto done; 918 goto done;
1073 } 919 }
1074 920
1075 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1076 { /* normal colors */ 922 { /* normal colors */
1077 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1078 SET_PIXCOLOR (idx);
1079 goto done; 924 goto done;
1080 } 925 }
1081 } 926 }
1082 927
1083 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1084 return;
1085
1086 /* XStoreColor (display->display, display->cmap, XColor*); */
1087 929
1088 /* 930 /*
1089 * 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,
1090 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1091 */ 933 */
1092# if 0
1093 for (i = Color_Black; i <= Color_White; i++)
1094 if (pix_colors[idx] == pix_colors[i])
1095 break;
1096 if (i > Color_White)
1097 {
1098 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1099 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1100 DisplayPlanes (display->display, display->screen));
1101 }
1102# endif
1103 934
1104 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1105 SET_PIXCOLOR (idx);
1106 936
1107 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1108 /* Cursor cursor; */ 938 /* Cursor cursor; */
1109done: 939done:
1110 940
1111#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1112 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1113 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 }
1114#endif 948#endif
1115 949
1116 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1117 951
1118 recolour_cursor (); 952 recolour_cursor ();
… …
1124#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1125 959
1126void 960void
1127rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1128{ 962{
1129 XColor xcol[2]; 963 XColor fg, bg;
1130 964
1131 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1132 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1133 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1134 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1135 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1136 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1137 972
1138 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1139 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1140} 974}
1141 975
1142/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1143/* 977/*
1144 * 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
… …
1148{ 982{
1149 unsigned int i; 983 unsigned int i;
1150 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1151 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1152 986
1153 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1154 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1155 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1156 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1157 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1158 { 991 {
… …
1173 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1174} 1007}
1175 1008
1176/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1177 1010
1178int 1011bool
1179rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1180{ 1013{
1181 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1182 {
1183 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1184 return false;
1185 }
1186
1187 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]);
1188} 1025}
1189 1026
1190/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1191 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1192 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1193void 1030void
1194rxvt_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)
1195{ 1032{
1196 int fix_screen; 1033 int fix_screen;
1197 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1198 dDisp; 1035 int old_height = szHint.height;
1199 1036
1200 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1201 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1202 1041
1203 if (!ignoreparent) 1042 if (!ignoreparent)
1204 { 1043 {
1205#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1206 /* 1045 /*
… …
1210 int x, y, x1, y1; 1049 int x, y, x1, y1;
1211 int dx, dy; 1050 int dx, dy;
1212 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1213 Window unused_cr; 1052 Window unused_cr;
1214 1053
1215 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1216 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1217 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1218 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1219 /* 1058 /*
1220 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1221 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1222 */ 1061 */
… …
1224 { 1063 {
1225 x -= x1; 1064 x -= x1;
1226 y -= y1; 1065 y -= y1;
1227 } 1066 }
1228 1067
1229 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1230 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1231 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1232 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1233 1072
1234 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1235 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1236 dx = 0; 1075 dx = 0;
… …
1239 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1240 dy = 0; 1079 dy = 0;
1241 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1242 dy /= 2; 1081 dy /= 2;
1243 1082
1244 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1245 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1246#else 1085#else
1247 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1248#endif 1087#endif
1249 } 1088 }
1250 1089
1251 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1252 1091
1253 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1254 { 1093 {
1255 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1256 { 1095 {
1257 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1258 window_sb_x, 0, 1097 window_sb_x, 0,
1259 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1260 resize_scrollbar (); 1099 resize_scrollbar ();
1261 } 1100 }
1262 1101
1263 if (menubar_visible ())
1264 XMoveResizeWindow (disp, menuBar.win,
1265 window_vt_x, 0,
1266 width, menuBar_TotalHeight ());
1267
1268 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1269 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1270 width, height); 1104 width, height);
1271 1105
1272 scr_clear (); 1106 scr_clear ();
1273#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1274 resize_pixmap (); 1108 resize_pixmap ();
1275#endif 1109#endif
1276 } 1110 }
1277 1111
1278 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1279 {
1280 int curr_screen = -1;
1281 int old_ncol = prev_ncol;
1282
1283 /* scr_reset only works on the primary screen */
1284 if (old_height) /* this is not the first time through */
1285 {
1286 unsigned int ocol = ncol;
1287 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1288 curr_screen = scr_change_screen (PRIMARY);
1289 ncol = ocol;
1290 }
1291
1292 scr_reset (); 1113 scr_reset ();
1293 1114
1294 if (curr_screen >= 0) /* this is not the first time through */ 1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1295 { 1116 //scr_touch (false);
1296 scr_change_screen (curr_screen);
1297 selection_check (old_ncol != ncol ? 4 : 0);
1298 }
1299 }
1300
1301 old_width = szHint.width;
1302 old_height = szHint.height;
1303 1117
1304#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1305 if (pixmap) 1119 if (pixmap)
1306 scr_touch (false); 1120 scr_touch (false);
1307#endif 1121#endif
1308 1122
1309#ifdef USE_XIM 1123#ifdef USE_XIM
1310 IMSetStatusPosition (); 1124 IMSetPosition ();
1311#endif 1125#endif
1312} 1126}
1313 1127
1314/* 1128/*
1315 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1320{ 1134{
1321 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1322 1136
1323 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1324 { 1138 {
1325 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1326 1140
1327 if (newwidth == 0) 1141 if (newwidth == 0)
1328 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1329 if (newheight == 0) 1143 if (newheight == 0)
1330 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1344#ifdef USE_XIM 1158#ifdef USE_XIM
1345 1159
1346void 1160void
1347rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1348{ 1162{
1349 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1350 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1351} 1165}
1352 1166
1353void 1167void
1354rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1355{ 1169{
… …
1392 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1393 1207
1394 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1395 *p = '\0'; 1209 *p = '\0';
1396 1210
1397 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1398 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1399 1213
1400 if (win != None) 1214 if (win != None)
1401 return True; 1215 return True;
1402 } 1216 }
1403 1217
… …
1410 XPoint nspot; 1224 XPoint nspot;
1411 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1412 1226
1413 if (!Input_Context 1227 if (!Input_Context
1414 || !focus 1228 || !focus
1415 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1416 return; 1230 return;
1417 1231
1418 im_set_position (nspot); 1232 im_set_position (nspot);
1419 1233
1420 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1439 input_method = 0; 1253 input_method = 0;
1440 } 1254 }
1441 1255
1442 Input_Context = 0; 1256 Input_Context = 0;
1443} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1444 1332
1445/* 1333/*
1446 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1447 * open a suitable preedit type 1335 * open a suitable preedit type
1448 */ 1336 */
… …
1455 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1456 unsigned long fg, bg; 1344 unsigned long fg, bg;
1457 const char *p; 1345 const char *p;
1458 char **s; 1346 char **s;
1459 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1460 1351
1461 TEMP_ENV; 1352 set_environ (envv);
1462 1353
1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1464 return false; 1355 return false;
1465 1356
1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1467 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1468 if (input_method == NULL) 1358 if (input_method == NULL)
1469 return false; 1359 return false;
1470 1360
1471 xim = input_method->xim; 1361 xim = input_method->xim;
… …
1491 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1492 1382
1493 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1494 { 1384 {
1495 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1496 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1497 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1498 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1499 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1500 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1501 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1502 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1503 1399
1504 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1505 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1506 { 1402 {
1507 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1545 "*", 1441 "*",
1546 fheight, 1442 fheight,
1547 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1548 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1549 1445
1550 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1551 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1552 1448
1553 if (missing_charset_list) 1449 if (missing_charset_list)
1554 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1555 1451
… …
1596 XNBackground, bg, 1492 XNBackground, bg,
1597 XNArea, &status_rect, 1493 XNArea, &status_rect,
1598 XNFontSet, fs, 1494 XNFontSet, fs,
1599 NULL); 1495 NULL);
1600 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1601 1520
1602 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1603 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1604 XNClientWindow, vt, 1523 XNClientWindow, vt,
1605 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1607 preedit_attr, 1526 preedit_attr,
1608 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1609 status_attr, NULL); 1528 status_attr, NULL);
1610 1529
1611 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1612 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1613 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1614 1533
1615 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1616 { 1535 {
1617 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1618 im_destroy (); 1537 im_destroy ();
1619 return false; 1538 return false;
1620 } 1539 }
1621 1540
1622 if (input_style & XIMPreeditArea) 1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input ();
1545#endif
1546
1623 IMSetStatusPosition (); 1547 IMSetPosition ();
1624 1548
1625 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1626 return true; 1549 return true;
1627} 1550}
1628 1551
1629void 1552void
1630rxvt_term::im_cb () 1553rxvt_term::im_cb ()
… …
1632 int i; 1555 int i;
1633 const char *p; 1556 const char *p;
1634 char **s; 1557 char **s;
1635 char buf[IMBUFSIZ]; 1558 char buf[IMBUFSIZ];
1636 1559
1637 SET_R (this); 1560 make_current ();
1638 1561
1639 im_destroy (); 1562 im_destroy ();
1640 1563
1641 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1642 if (Input_Context) 1564 if (Input_Context)
1643 return; 1565 return;
1644 1566
1645#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1567#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1646 if (rs[Rs_imLocale]) 1568 if (rs[Rs_imLocale])
… …
1688 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1689#endif 1611#endif
1690} 1612}
1691 1613
1692void 1614void
1693rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1694{ 1616{
1695 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1696 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1697 1619
1698 if (!Input_Context 1620 if (!Input_Context
1699 || !focus 1621 || !focus
1700 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1701 || !IMisRunning ()) 1623 || !IMisRunning ())
1702 return; 1624 return;
1703 1625
1704 /* Getting the necessary width of preedit area */ 1626 /* Getting the necessary width of preedit area */
1705 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
… …
1708 1630
1709 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1710 XFree (needed_rect); 1632 XFree (needed_rect);
1711 1633
1712 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1713 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1714 1636
1715 XSetICValues (Input_Context, 1637 XSetICValues (Input_Context,
1716 XNPreeditAttributes, preedit_attr, 1638 XNPreeditAttributes, preedit_attr,
1717 XNStatusAttributes, status_attr, NULL); 1639 XNStatusAttributes, status_attr,
1640 NULL);
1718 1641
1719 XFree (preedit_attr); 1642 XFree (preedit_attr);
1720 XFree (status_attr); 1643 XFree (status_attr);
1721} 1644}
1722#endif /* USE_XIM */ 1645#endif /* USE_XIM */
1723 1646
1724/*----------------------------------------------------------------------*/
1725rxvt_t rxvt_current_term;
1726
1727/*----------------------- end-of-file (C source) -----------------------*/ 1647/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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