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.181 by root, Tue Jan 17 06:06:42 2006 UTC vs.
Revision 1.246 by sasha, Mon Aug 20 20:13:35 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
73 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 67 return false;
75 68
76 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
78 return true; 71 return true;
79} 72}
80 73
81void 74void
82rxvt_push_locale (const char *locale) 75rxvt_push_locale (const char *locale) NOTHROW
83{ 76{
84 strcpy (savelocale, curlocale); 77 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 78 rxvt_set_locale (locale);
86} 79}
87 80
88void 81void
89rxvt_pop_locale () 82rxvt_pop_locale () NOTHROW
90{ 83{
91 rxvt_set_locale (savelocale); 84 rxvt_set_locale (savelocale);
92} 85}
93 86
94#if ENABLE_COMBINING 87#if ENABLE_COMBINING
… …
155} 148}
156#endif 149#endif
157 150
158rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
159 : 152 :
160#if TRANSPARENT 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
162#endif 158#endif
163#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 161#endif
166#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 178 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 179#endif
184#ifdef USE_XIM 180#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 181 im_ev (this, &rxvt_term::im_cb),
186#endif 182#endif
183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb),
185#endif
187 termwin_ev (this, &rxvt_term::x_cb), 186 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 187 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 189 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 190 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 192 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 193 incr_ev (this, &rxvt_term::incr_cb)
… …
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 201#endif
205} 202}
206 203
207// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 205// for use before an emergency exit
209void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
210{ 207{
211 if (cmd_pid) 208 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
213 210
214#ifdef UTMP_SUPPORT 211 pty_ev.stop ();
215 privileged_utmp (RESTORE); 212 delete pty; pty = 0;
216#endif
217
218 pty.put ();
219} 213}
220 214
221rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
222{ 216{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 217 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 218
227 emergency_cleanup (); 219 emergency_cleanup ();
228 220
229#if ENABLE_STYLES 221#if ENABLE_STYLES
… …
233#endif 225#endif
234 delete fontset[0]; 226 delete fontset[0];
235 227
236 if (display) 228 if (display)
237 { 229 {
238 dDisp;
239
240 selection_clear (); 230 selection_clear ();
241 231
242#ifdef USE_XIM 232#ifdef USE_XIM
243 im_destroy (); 233 im_destroy ();
244#endif 234#endif
245#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 238#endif
249#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 241#endif
252#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 253#endif
264#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 258#endif
269 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
270 260
271 delete drawable; 261 delete drawable;
272 // destroy all windows 262 // destroy all windows
273 if (parent[0]) 263 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
275 }
276 265
277 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
278 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
279#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
281#endif 281#endif
282 282
283 displays.put (display); 283 displays.put (display);
284 284
285 scr_release (); 285 scr_release ();
… …
288 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 289 free (allocated [i]);
290 290
291 free (selection.text); 291 free (selection.text);
292 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 293 free (env_display);
295 free (env_term); 294 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 295 free (locale);
298 free (v_buffer); 296 free (v_buffer);
299 free (incr_buf); 297 free (incr_buf);
300 298
301 delete envv; 299 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 302#ifdef KEYSYM_RESOURCE
305 delete keyboard; 303 delete keyboard;
306#endif 304#endif
307} 305}
308 306
307// child has exited, usually destroys
309void 308void
310rxvt_term::child_exit () 309rxvt_term::child_cb (child_watcher &w, int status)
311{ 310{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312
312 cmd_pid = 0; 313 cmd_pid = 0;
313 314
314 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
315 destroy (); 316 destroy ();
316} 317}
317 318
318void 319void
319rxvt_term::destroy () 320rxvt_term::destroy ()
320{ 321{
321 if (destroy_ev.active) 322 if (destroy_ev.active)
322 return; 323 return;
323 324
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326
324#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
325 scr_overlay_off (); 328 scr_overlay_off ();
326#endif 329#endif
327 330
328 if (display) 331 if (display)
… …
331 im_ev.stop (display); 334 im_ev.stop (display);
332#endif 335#endif
333#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
335#endif 338#endif
336#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
338#endif 341#endif
339 incr_ev.stop (); 342 incr_ev.stop ();
340 termwin_ev.stop (display); 343 termwin_ev.stop (display);
341 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
382{ 385{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
385} 388}
386 389
387#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
388static void 391static void
389print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
390{ 393{
391 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
441 else 444 else
442 { 445 {
443 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 447 // so just output the error and continue
445#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
446 print_x_error (display, event); 451 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 452#endif
450 } 453 }
451 454
452 return 0; 455 return 0;
453} 456}
… …
461 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
462} 465}
463 466
464/*----------------------------------------------------------------------*/ 467/*----------------------------------------------------------------------*/
465bool 468bool
466rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 470{
471 this->envv = envv;
472
468 SET_R (this); 473 SET_R (this);
469 set_locale (""); 474 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 475 set_environ (envv); // few things in X do not call setlocale :(
471 476
472 if (!init_vars ()) 477 if (!init_vars ())
… …
479#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 485 keyboard->register_done ();
481#endif 486#endif
482 487
483#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 491#endif
487 492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!option (Opt_transparent))
547 update_background ();
548 }
549#endif
550 }
551#endif
552
488#if ENABLE_PERL 553#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
514 create_windows (argc, argv);
515
516 dDisp;
517
518 init_xlocale ();
519
520 scr_reset (); // initialize screen
521
522#if 0
523 XSynchronize (disp, True);
524#endif
525
526#ifdef HAVE_SCROLLBARS
527 if (OPTION (Opt_scrollBar))
528 resize_scrollbar (); /* create and map scrollbar */
529#endif
530#ifdef TRANSPARENT
531 if (OPTION (Opt_transparent))
532 {
533 XSelectInput (disp, display->root, PropertyChangeMask);
534 check_our_parents ();
535 rootwin_ev.start (display, display->root); 554 rootwin_ev.start (display, display->root);
536 }
537#endif 555#endif
538
539 XMapWindow (disp, vt);
540 XMapWindow (disp, parent[0]);
541 556
542 set_colorfgbg (); 557 set_colorfgbg ();
543 558
544 init_command (cmd_argv); 559 init_command (cmd_argv);
545 560
546 free (cmd_argv); 561 free (cmd_argv);
547 562
548 if (pty.pty >= 0) 563 if (pty->pty >= 0)
549 pty_ev.start (pty.pty, EVENT_READ); 564 pty_ev.start (pty->pty, EVENT_READ);
550 565
551 check_ev.start (); 566 check_ev.start ();
552 567
553 HOOK_INVOKE ((this, HOOK_START, DT_END)); 568 HOOK_INVOKE ((this, HOOK_START, DT_END));
554 569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
555 return true; 583 return true;
556} 584}
557 585
558static struct sig_handlers 586static struct sig_handlers
559{ 587{
560 sig_watcher sw_chld, sw_term, sw_int; 588 sig_watcher sw_term, sw_int;
561 589
562 void sig_chld (sig_watcher &w)
563 {
564 // we are being called for every SIGCHLD, find the corresponding term
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->child_exit ();
572 break;
573 }
574 }
575
576 /* 590 /*
577 * Catch a fatal signal and tidy up before quitting 591 * Catch a fatal signal and tidy up before quitting
578 */ 592 */
579 void 593 void
580 sig_term (sig_watcher &w) 594 sig_term (sig_watcher &w)
581 { 595 {
582#ifdef DEBUG_CMD
583 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584#endif
585 rxvt_emergency_cleanup (); 596 rxvt_emergency_cleanup ();
586 signal (w.signum, SIG_DFL); 597 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum); 598 kill (getpid (), w.signum);
588 } 599 }
589 600
590 sig_handlers () 601 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term), 602 : sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term) 603 sw_int (this, &sig_handlers::sig_term)
594 { 604 {
595 } 605 }
596} sig_handlers; 606} sig_handlers;
597 607
598char **rxvt_environ; // startup environment 608char **rxvt_environ; // startup environment
599 609
600void 610void
601rxvt_init () 611rxvt_init ()
602{ 612{
613 ptytty::init ();
614
603 rxvt_environ = environ; 615 rxvt_environ = environ;
604
605 /*
606 * Save and then give up any super-user privileges
607 * If we need privileges in any area then we must specifically request it.
608 * We should only need to be root in these cases:
609 * 1. write utmp entries on some systems
610 * 2. chown tty on some systems
611 */
612 rxvt_privileges (SAVE);
613 rxvt_privileges (IGNORE);
614 616
615 signal (SIGHUP, SIG_IGN); 617 signal (SIGHUP, SIG_IGN);
616 signal (SIGPIPE, SIG_IGN); 618 signal (SIGPIPE, SIG_IGN);
617 619
618 sig_handlers.sw_chld.start (SIGCHLD);
619 sig_handlers.sw_term.start (SIGTERM); 620 sig_handlers.sw_term.start (SIGTERM);
620 sig_handlers.sw_int.start (SIGINT); 621 sig_handlers.sw_int.start (SIGINT);
621 622
622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
623 /* signal (SIGURG, SIG_DFL); */ 624 /* signal (SIGURG, SIG_DFL); */
… …
652 rxvt_fatal ("memory allocation failure. aborting.\n"); 653 rxvt_fatal ("memory allocation failure. aborting.\n");
653 654
654 return p; 655 return p;
655} 656}
656 657
657void * 658void *
658rxvt_realloc (void *ptr, size_t size) 659rxvt_realloc (void *ptr, size_t size)
659{ 660{
660 void *p = realloc (ptr, size); 661 void *p = realloc (ptr, size);
661 662
662 if (!p) 663 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n"); 664 rxvt_fatal ("memory allocation failure. aborting.\n");
664 665
665 return p; 666 return p;
666} 667}
667 668
668/* ------------------------------------------------------------------------- *
669 * PRIVILEGED OPERATIONS *
670 * ------------------------------------------------------------------------- */
671/* take care of suid/sgid super-user (root) privileges */
672void
673rxvt_privileges (rxvt_privaction action)
674{
675#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 setegid (getgid ());
691 seteuid (getuid ());
692 break;
693 case SAVE:
694 saved_egid = getegid ();
695 saved_euid = geteuid ();
696 break;
697 case RESTORE:
698 setegid (saved_egid);
699 seteuid (saved_euid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setgid (getgid ());
707 setuid (getuid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 session.login (pty.name, cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
730 else
731 session.logout ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736
737/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
738/* 670/*
739 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
741 */ 673 */
742void 674void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 676{
745 short recalc_x, recalc_y; 677 short recalc_x, recalc_y;
746 int x, y, sb_w, flags; 678 int x, y, sb_w, flags;
747 unsigned int w, h; 679 unsigned int w, h;
748 unsigned int max_width, max_height; 680 unsigned int max_width, max_height;
749 dDisp;
750
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752 ncol, nrow, szHint.width, szHint.height));
753 681
754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
755 szHint.win_gravity = NorthWestGravity; 683 szHint.win_gravity = NorthWestGravity;
756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 684 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757 685
… …
819 747
820 if (scrollBar.state) 748 if (scrollBar.state)
821 { 749 {
822 sb_w = scrollbar_TotalWidth (); 750 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 751 szHint.base_width += sb_w;
752
824 if (!OPTION (Opt_scrollBar_right)) 753 if (!option (Opt_scrollBar_right))
825 window_vt_x += sb_w; 754 window_vt_x += sb_w;
826 } 755 }
827 756
828 szHint.width_inc = fwidth; 757 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 758 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 759 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 760 szHint.min_height = szHint.base_height + szHint.height_inc;
832 761
833 if (newwidth && newwidth - szHint.base_width < max_width) 762 if (newwidth && newwidth - szHint.base_width < max_width)
834 { 763 {
835 szHint.width = newwidth; 764 szHint.width = newwidth;
… …
850 { 779 {
851 min_it (height, max_height); 780 min_it (height, max_height);
852 szHint.height = szHint.base_height + height; 781 szHint.height = szHint.base_height + height;
853 } 782 }
854 783
855 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 784 if (scrollBar.state && option (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
857 786
858 if (recalc_x) 787 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789
860 if (recalc_y) 790 if (recalc_y)
861 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
862 792
863 ncol = width / fwidth; 793 ncol = width / fwidth;
864 nrow = height / fheight; 794 nrow = height / fheight;
865 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866 ncol, nrow, szHint.width,
867 szHint.height));
868 return;
869} 795}
870 796
871/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
872/* 798/*
873 * Tell the teletype handler what size the window is. 799 * Tell the teletype handler what size the window is.
874 * Called after a window size change. 800 * Called after a window size change.
875 */ 801 */
876void 802void
877rxvt_term::tt_winch () 803rxvt_term::tt_winch ()
878{ 804{
879 if (pty.pty < 0) 805 if (pty->pty < 0)
880 return; 806 return;
881 807
882 struct winsize ws; 808 struct winsize ws;
883 809
884 ws.ws_col = ncol; 810 ws.ws_col = ncol;
885 ws.ws_row = nrow; 811 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 812 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 813 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 815
890#if 0 816#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 818 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 819 kill (-cmd_pid, SIGWINCH);
… …
925 delete fontset[0]; 851 delete fontset[0];
926 fontset[0] = fs; 852 fontset[0] = fs;
927 853
928 prop = (*fs)[1]->properties (); 854 prop = (*fs)[1]->properties ();
929 prop.height += lineSpace; 855 prop.height += lineSpace;
856
930 fs->set_prop (prop); 857 fs->set_prop (prop, false);
931 858
932 fwidth = prop.width; 859 fwidth = prop.width;
933 fheight = prop.height; 860 fheight = prop.height;
934 fbase = prop.ascent; 861 fbase = prop.ascent;
935 862
… …
944 { 871 {
945 fontset[style] = fs = new rxvt_fontset (this); 872 fontset[style] = fs = new rxvt_fontset (this);
946 rxvt_fontprop prop2 = prop; 873 rxvt_fontprop prop2 = prop;
947 874
948 if (res) 875 if (res)
949 prop2.weight = prop2.slant = rxvt_fontprop::unset; 876 {
877 fs->populate (res);
878 fs->set_prop (prop2, false);
879 }
950 else 880 else
951 { 881 {
952 res = fontset[0]->fontdesc; 882 fs->populate (fontset[0]->fontdesc);
953 883
954 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 884 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
955 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 885 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886
887 fs->set_prop (prop2, true);
956 } 888 }
957 889
958 fs->populate (res);
959 fs->set_prop (prop2);
960 } 890 }
961#else 891#else
962 fontset[style] = fontset[0]; 892 fontset[style] = fontset[0];
963#endif 893#endif
964 } 894 }
… …
973 return true; 903 return true;
974} 904}
975 905
976void rxvt_term::set_string_property (Atom prop, const char *str, int len) 906void rxvt_term::set_string_property (Atom prop, const char *str, int len)
977{ 907{
978 XChangeProperty (display->display, parent[0], 908 XChangeProperty (dpy, parent[0],
979 prop, XA_STRING, 8, PropModeReplace, 909 prop, XA_STRING, 8, PropModeReplace,
980 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 910 (const unsigned char *)str, len >= 0 ? len : strlen (str));
981} 911}
982 912
983void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
984{ 914{
985 wchar_t *ws = rxvt_mbstowcs (str, len); 915 wchar_t *ws = rxvt_mbstowcs (str, len);
986 char *s = rxvt_wcstoutf8 (ws); 916 char *s = rxvt_wcstoutf8 (ws);
987 917
988 XChangeProperty (display->display, parent[0], 918 XChangeProperty (dpy, parent[0],
989 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
990 (const unsigned char *)s, strlen (s)); 920 (const unsigned char *)s, strlen (s));
991 921
992 free (s); 922 free (s);
993 free (ws); 923 free (ws);
… …
1018void 948void
1019rxvt_term::set_window_color (int idx, const char *color) 949rxvt_term::set_window_color (int idx, const char *color)
1020{ 950{
1021 rxvt_color xcol; 951 rxvt_color xcol;
1022 int i; 952 int i;
1023 953
1024 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
1025 return; 955 return;
956
957 color = strdup (color);
958 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color;
1026 960
1027 /* handle color aliases */ 961 /* handle color aliases */
1028 if (isdigit (*color)) 962 if (isdigit (*color))
1029 { 963 {
1030 i = atoi (color); 964 i = atoi (color);
1031 965
1032 if (i >= 8 && i <= 15) 966 if (i >= 8 && i <= 15)
1033 { /* bright colors */ 967 { /* bright colors */
1034 i -= 8; 968 i -= 8;
1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1036 SET_PIXCOLOR (idx);
1037 goto done; 970 goto done;
1038 } 971 }
1039 972
1040 if (i >= 0 && i <= 7) 973 if (i >= 0 && i <= 7)
1041 { /* normal colors */ 974 { /* normal colors */
1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1043 SET_PIXCOLOR (idx);
1044 goto done; 976 goto done;
1045 } 977 }
1046 } 978 }
1047 979
1048 if (!rXParseAllocColor (&xcol, color)) 980 set_color (xcol, color);
1049 return;
1050
1051 /* XStoreColor (display->display, display->cmap, XColor*); */
1052 981
1053 /* 982 /*
1054 * FIXME: should free colors here, but no idea how to do it so instead, 983 * FIXME: should free colors here, but no idea how to do it so instead,
1055 * so just keep gobbling up the colormap 984 * so just keep gobbling up the colormap
1056 */ 985 */
1057# if 0
1058 for (i = Color_Black; i <= Color_White; i++)
1059 if (pix_colors[idx] == pix_colors[i])
1060 break;
1061 if (i > Color_White)
1062 {
1063 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1064 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1065 DisplayPlanes (display->display, display->screen));
1066 }
1067# endif
1068 986
1069 pix_colors_focused[idx] = xcol; 987 pix_colors_focused[idx] = xcol;
1070 SET_PIXCOLOR (idx);
1071 988
1072 /* XSetWindowAttributes attr; */ 989 /* XSetWindowAttributes attr; */
1073 /* Cursor cursor; */ 990 /* Cursor cursor; */
1074done: 991done:
1075
1076#if OFF_FOCUS_FADING
1077 if (rs[Rs_fade])
1078 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1079#endif
1080
1081 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
1082 993
994 update_fade_color (idx);
1083 recolour_cursor (); 995 recolour_cursor ();
1084 scr_recolour (); 996 scr_recolour ();
1085} 997}
1086 998
1087#else 999#else
… …
1089#endif /* XTERM_COLOR_CHANGE */ 1001#endif /* XTERM_COLOR_CHANGE */
1090 1002
1091void 1003void
1092rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
1093{ 1005{
1094 XColor xcol[2]; 1006 XColor fg, bg;
1095 1007
1096 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
1097 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
1098 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
1099 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
1100 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
1101 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
1102 1015
1103 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1104 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1105} 1017}
1106 1018
1107/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
1108/* 1020/*
1109 * find if fg/bg matches any of the normal (low-intensity) colors 1021 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1113{ 1025{
1114 unsigned int i; 1026 unsigned int i;
1115 const char *xpmb = "\0"; 1027 const char *xpmb = "\0";
1116 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1117 1029
1118 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1119 strcpy (fstr, "default"); 1030 strcpy (fstr, "default");
1120 strcpy (bstr, "default"); 1031 strcpy (bstr, "default");
1121 for (i = Color_Black; i <= Color_White; i++) 1032 for (i = Color_Black; i <= Color_White; i++)
1122 if (pix_colors[Color_fg] == pix_colors[i]) 1033 if (pix_colors[Color_fg] == pix_colors[i])
1123 { 1034 {
… …
1138 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1139} 1050}
1140 1051
1141/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1142 1053
1143int 1054bool
1144rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1145{ 1056{
1146 if (!screen_in_out->set (display, colour)) 1057 if (color.set (this, name))
1147 {
1148 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1149 return false;
1150 }
1151
1152 return true; 1058 return true;
1059
1060 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1061 return false;
1062}
1063
1064void
1065rxvt_term::alias_color (int dst, int src)
1066{
1067 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1153} 1068}
1154 1069
1155/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1156 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1157 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
1158void 1073void
1159rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1074rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1160{ 1075{
1161 int fix_screen; 1076 int fix_screen;
1162 int old_width = szHint.width, old_height = szHint.height; 1077 int old_width = szHint.width;
1163 dDisp; 1078 int old_height = szHint.height;
1164 1079
1165 window_calc (newwidth, newheight); 1080 window_calc (newwidth, newheight);
1081
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1166 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1167 1084
1168 if (!ignoreparent) 1085 if (!ignoreparent)
1169 { 1086 {
1170#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1171 /* 1088 /*
… …
1175 int x, y, x1, y1; 1092 int x, y, x1, y1;
1176 int dx, dy; 1093 int dx, dy;
1177 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1178 Window unused_cr; 1095 Window unused_cr;
1179 1096
1180 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1181 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1182 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1183 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1184 /* 1101 /*
1185 * if display->root isn't the parent window, a WM will probably have offset 1102 * if display->root isn't the parent window, a WM will probably have offset
1186 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1187 */ 1104 */
… …
1189 { 1106 {
1190 x -= x1; 1107 x -= x1;
1191 y -= y1; 1108 y -= y1;
1192 } 1109 }
1193 1110
1194 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1195 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1196 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1197 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1198 1115
1199 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1200 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
1201 dx = 0; 1118 dx = 0;
… …
1204 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1205 dy = 0; 1122 dy = 0;
1206 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1207 dy /= 2; 1124 dy /= 2;
1208 1125
1209 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1210 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1211#else 1128#else
1212 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1213#endif 1130#endif
1214 } 1131 }
1215 1132
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1134
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1136 {
1220 if (scrollBar.state) 1137 if (scrollBar.state)
1221 { 1138 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1223 window_sb_x, 0, 1140 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1142 resize_scrollbar ();
1226 } 1143 }
1227 1144
1228 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1229 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1230 width, height); 1147 width, height);
1231 1148
1149#ifdef XPM_BACKGROUND
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1232 scr_clear (); 1154 scr_clear ();
1233#ifdef XPM_BACKGROUND
1234 resize_pixmap ();
1235#endif
1236 } 1155 }
1237 1156
1238 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1239 {
1240 int curr_screen = -1;
1241 int old_ncol = prev_ncol;
1242
1243 /* scr_reset only works on the primary screen */
1244 if (old_height) /* this is not the first time through */
1245 {
1246 unsigned int ocol = ncol;
1247 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1248 curr_screen = scr_change_screen (PRIMARY);
1249 ncol = ocol;
1250 }
1251
1252 scr_reset (); 1158 scr_reset ();
1253 1159
1254 if (curr_screen >= 0) /* this is not the first time through */ 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1255 { 1161 //scr_touch (false);
1256 scr_change_screen (curr_screen);
1257 selection_check (old_ncol != ncol ? 4 : 0);
1258 }
1259 }
1260 1162
1261 old_width = szHint.width; 1163#ifdef HAVE_BG_PIXMAP
1262 old_height = szHint.height; 1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1263 1165// if (bgPixmap.pixmap)
1264#ifdef XPM_BACKGROUND
1265 if (pixmap)
1266 scr_touch (false); 1166// scr_touch (false);
1267#endif 1167#endif
1268 1168
1269#ifdef USE_XIM 1169#ifdef USE_XIM
1270 IMSetStatusPosition (); 1170 IMSetPosition ();
1271#endif 1171#endif
1272} 1172}
1273 1173
1274/* 1174/*
1275 * Set the width/height of the vt window in characters. Units are pixels. 1175 * Set the width/height of the vt window in characters. Units are pixels.
… …
1280{ 1180{
1281 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1282 1182
1283 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1284 { 1184 {
1285 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1286 1186
1287 if (newwidth == 0) 1187 if (newwidth == 0)
1288 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1289 if (newheight == 0) 1189 if (newheight == 0)
1290 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
… …
1304#ifdef USE_XIM 1204#ifdef USE_XIM
1305 1205
1306void 1206void
1307rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1308{ 1208{
1309 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1310 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1311} 1211}
1312 1212
1313void 1213void
1314rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1315{ 1215{
… …
1352 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1353 1253
1354 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1355 *p = '\0'; 1255 *p = '\0';
1356 1256
1357 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1358 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1359 1259
1360 if (win != None) 1260 if (win != None)
1361 return True; 1261 return True;
1362 } 1262 }
1363 1263
… …
1370 XPoint nspot; 1270 XPoint nspot;
1371 XVaNestedList preedit_attr; 1271 XVaNestedList preedit_attr;
1372 1272
1373 if (!Input_Context 1273 if (!Input_Context
1374 || !focus 1274 || !focus
1375 || !(input_style & XIMPreeditPosition)) 1275 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1376 return; 1276 return;
1377 1277
1378 im_set_position (nspot); 1278 im_set_position (nspot);
1379 1279
1380 if (nspot.x == spot.x && nspot.y == spot.y) 1280 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1399 input_method = 0; 1299 input_method = 0;
1400 } 1300 }
1401 1301
1402 Input_Context = 0; 1302 Input_Context = 0;
1403} 1303}
1304
1305#ifdef ENABLE_XIM_ONTHESPOT
1306
1307static void
1308xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1309{
1310 ((rxvt_term *)client_data)->make_current ();
1311 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1312}
1313
1314static void
1315xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1316{
1317 ((rxvt_term *)client_data)->make_current ();
1318 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1319}
1320
1321static void
1322xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1323{
1324 rxvt_term *term = (rxvt_term *)client_data;
1325 XIMText *text = call_data->text;
1326
1327 term->make_current ();
1328
1329 if (text)
1330 {
1331 void *str;
1332
1333 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 {
1335 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]);
1338
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1341
1342 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale);
1344 }
1345 else
1346 str = (void *)text->string.wide_char;
1347
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1353 DT_WCS_LEN, str, str ? (int)text->length : 0,
1354 DT_END));
1355 }
1356 else
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length,
1361 DT_END));
1362}
1363
1364#if 0
1365static void
1366xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1367{
1368 ((rxvt_term *)client_data)->make_current ();
1369 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1370 DT_INT, call_data->position,
1371 DT_INT, call_data->direction,
1372 DT_INT, call_data->style,
1373 DT_END));
1374}
1375#endif
1376
1377#endif
1404 1378
1405/* 1379/*
1406 * Try to open a XIM with the current modifiers, then see if we can 1380 * Try to open a XIM with the current modifiers, then see if we can
1407 * open a suitable preedit type 1381 * open a suitable preedit type
1408 */ 1382 */
… …
1415 XRectangle rect, status_rect, needed_rect; 1389 XRectangle rect, status_rect, needed_rect;
1416 unsigned long fg, bg; 1390 unsigned long fg, bg;
1417 const char *p; 1391 const char *p;
1418 char **s; 1392 char **s;
1419 XIMStyles *xim_styles; 1393 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1420 1397
1421 set_environ (envv); 1398 set_environ (envv);
1422 1399
1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424 return false; 1401 return false;
1425 1402
1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1428 if (input_method == NULL) 1404 if (input_method == NULL)
1429 return false; 1405 return false;
1430 1406
1431 xim = input_method->xim; 1407 xim = input_method->xim;
… …
1451 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1452 1428
1453 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1454 { 1430 {
1455 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1456 input_style = (XIMPreeditPosition | XIMStatusNothing); 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
1457 else if (!strcmp (s[i], "OffTheSpot")) 1433 else if (!strcmp (s[i], "OffTheSpot"))
1458 input_style = (XIMPreeditArea | XIMStatusArea); 1434 input_style = XIMPreeditArea | XIMStatusArea;
1459 else if (!strcmp (s[i], "Root")) 1435 else if (!strcmp (s[i], "Root"))
1460 input_style = (XIMPreeditNothing | XIMStatusNothing); 1436 input_style = XIMPreeditNothing | XIMStatusNothing;
1461 else if (!strcmp (s[i], "None")) 1437 else if (!strcmp (s[i], "None"))
1462 input_style = (XIMPreeditNone | XIMStatusNone); 1438 input_style = XIMPreeditNone | XIMStatusNone;
1439#ifdef ENABLE_XIM_ONTHESPOT
1440 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1441 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1442#endif
1443 else
1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1463 1445
1464 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1465 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1466 { 1448 {
1467 rxvt_freecommastring (s); 1449 rxvt_freecommastring (s);
… …
1505 "*", 1487 "*",
1506 fheight, 1488 fheight,
1507 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1508 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1509 1491
1510 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1511 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1512 1494
1513 if (missing_charset_list) 1495 if (missing_charset_list)
1514 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1515 1497
… …
1556 XNBackground, bg, 1538 XNBackground, bg,
1557 XNArea, &status_rect, 1539 XNArea, &status_rect,
1558 XNFontSet, fs, 1540 XNFontSet, fs,
1559 NULL); 1541 NULL);
1560 } 1542 }
1543#if ENABLE_XIM_ONTHESPOT
1544 else if (input_style & XIMPreeditCallbacks)
1545 {
1546 im_set_position (spot);
1547
1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1551# if 0
1552 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1553# endif
1554
1555 preedit_attr = XVaCreateNestedList (0,
1556 XNSpotLocation, &spot,
1557 XNPreeditStartCallback, &xcb[0],
1558 XNPreeditDoneCallback , &xcb[1],
1559 XNPreeditDrawCallback , &xcb[2],
1560# if 0
1561 XNPreeditCaretCallback, &xcb[3],
1562# endif
1563 NULL);
1564 }
1565#endif
1561 1566
1562 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1563 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1564 XNClientWindow, vt, 1569 XNClientWindow, vt,
1565 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
… …
1567 preedit_attr, 1572 preedit_attr,
1568 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1569 status_attr, NULL); 1574 status_attr, NULL);
1570 1575
1571 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1572 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1573 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1574 1579
1575 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1576 { 1581 {
1577 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578 im_destroy (); 1583 im_destroy ();
1579 return false; 1584 return false;
1580 } 1585 }
1581 1586
1582 if (input_style & XIMPreeditArea) 1587#if 0
1588 // unfortunately, only the focus window is used by XIM, hard to fix
1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1590 vt_select_input ();
1591#endif
1592
1583 IMSetStatusPosition (); 1593 IMSetPosition ();
1584 1594
1585 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586 return true; 1595 return true;
1587} 1596}
1588 1597
1589void 1598void
1590rxvt_term::im_cb () 1599rxvt_term::im_cb ()
… …
1596 1605
1597 make_current (); 1606 make_current ();
1598 1607
1599 im_destroy (); 1608 im_destroy ();
1600 1609
1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602 if (Input_Context) 1610 if (Input_Context)
1603 return; 1611 return;
1604 1612
1605#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1606 if (rs[Rs_imLocale]) 1614 if (rs[Rs_imLocale])
… …
1648 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1649#endif 1657#endif
1650} 1658}
1651 1659
1652void 1660void
1653rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1654{ 1662{
1655 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1656 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1657 1665
1658 if (!Input_Context 1666 if (!Input_Context
1659 || !focus 1667 || !focus
1660 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1661 || !IMisRunning ()) 1669 || !IMisRunning ())
1662 return; 1670 return;
1663 1671
1672 if (input_style & XIMPreeditPosition)
1673 {
1674 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676
1677 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL);
1679 }
1680 else
1681 {
1664 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1665 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1666 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1667 XFree (status_attr); 1685 XFree (status_attr);
1668 1686
1669 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1670 XFree (needed_rect); 1688 XFree (needed_rect);
1671 1689
1672 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1673 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1674 1692
1675 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1676 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1677 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1678 1697
1698 XFree (status_attr);
1699 }
1700
1679 XFree (preedit_attr); 1701 XFree (preedit_attr);
1680 XFree (status_attr);
1681} 1702}
1682#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1683 1704
1684/*----------------------------------------------------------------------*/
1685rxvt_t rxvt_current_term;
1686
1687/*----------------------- end-of-file (C source) -----------------------*/ 1705/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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