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.183 by root, Tue Jan 17 10:19:13 2006 UTC vs.
Revision 1.245 by sasha, Fri Aug 17 22:02:14 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 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif
554 }
555#endif
556
488#if ENABLE_PERL 557#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); 558 rootwin_ev.start (display, display->root);
536 }
537#endif 559#endif
538
539 XMapWindow (disp, vt);
540 XMapWindow (disp, parent[0]);
541 560
542 set_colorfgbg (); 561 set_colorfgbg ();
543 562
544 init_command (cmd_argv); 563 init_command (cmd_argv);
545 564
546 free (cmd_argv); 565 free (cmd_argv);
547 566
548 if (pty.pty >= 0) 567 if (pty->pty >= 0)
549 pty_ev.start (pty.pty, EVENT_READ); 568 pty_ev.start (pty->pty, EVENT_READ);
550 569
551 check_ev.start (); 570 check_ev.start ();
552 571
553 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
554 573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586
555 return true; 587 return true;
556} 588}
557 589
558static struct sig_handlers 590static struct sig_handlers
559{ 591{
560 sig_watcher sw_chld, sw_term, sw_int; 592 sig_watcher sw_term, sw_int;
561 593
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 /* 594 /*
577 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
578 */ 596 */
579 void 597 void
580 sig_term (sig_watcher &w) 598 sig_term (sig_watcher &w)
581 { 599 {
582#ifdef DEBUG_CMD
583 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584#endif
585 rxvt_emergency_cleanup (); 600 rxvt_emergency_cleanup ();
586 signal (w.signum, SIG_DFL); 601 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum); 602 kill (getpid (), w.signum);
588 } 603 }
589 604
590 sig_handlers () 605 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term), 606 : sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term) 607 sw_int (this, &sig_handlers::sig_term)
594 { 608 {
595 } 609 }
596} sig_handlers; 610} sig_handlers;
597 611
598char **rxvt_environ; // startup environment 612char **rxvt_environ; // startup environment
599 613
600void 614void
601rxvt_init () 615rxvt_init ()
602{ 616{
617 ptytty::init ();
618
603 rxvt_environ = environ; 619 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 620
615 signal (SIGHUP, SIG_IGN); 621 signal (SIGHUP, SIG_IGN);
616 signal (SIGPIPE, SIG_IGN); 622 signal (SIGPIPE, SIG_IGN);
617 623
618 sig_handlers.sw_chld.start (SIGCHLD);
619 sig_handlers.sw_term.start (SIGTERM); 624 sig_handlers.sw_term.start (SIGTERM);
620 sig_handlers.sw_int.start (SIGINT); 625 sig_handlers.sw_int.start (SIGINT);
621 626
622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 627 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
623 /* signal (SIGURG, SIG_DFL); */ 628 /* signal (SIGURG, SIG_DFL); */
… …
652 rxvt_fatal ("memory allocation failure. aborting.\n"); 657 rxvt_fatal ("memory allocation failure. aborting.\n");
653 658
654 return p; 659 return p;
655} 660}
656 661
657void * 662void *
658rxvt_realloc (void *ptr, size_t size) 663rxvt_realloc (void *ptr, size_t size)
659{ 664{
660 void *p = realloc (ptr, size); 665 void *p = realloc (ptr, size);
661 666
662 if (!p) 667 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n"); 668 rxvt_fatal ("memory allocation failure. aborting.\n");
664 669
665 return p; 670 return p;
666} 671}
667 672
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 return;
724
725 rxvt_privileges (RESTORE);
726
727 if (action == SAVE)
728 pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
729 else
730 pty.logout ();
731
732 rxvt_privileges (IGNORE);
733}
734#endif
735
736/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
737/* 674/*
738 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
739 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
740 */ 677 */
741void 678void
742rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
743{ 680{
744 short recalc_x, recalc_y; 681 short recalc_x, recalc_y;
745 int x, y, sb_w, flags; 682 int x, y, sb_w, flags;
746 unsigned int w, h; 683 unsigned int w, h;
747 unsigned int max_width, max_height; 684 unsigned int max_width, max_height;
748 dDisp;
749
750 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
751 ncol, nrow, szHint.width, szHint.height));
752 685
753 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 686 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
754 szHint.win_gravity = NorthWestGravity; 687 szHint.win_gravity = NorthWestGravity;
755 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 688 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
756 689
… …
818 751
819 if (scrollBar.state) 752 if (scrollBar.state)
820 { 753 {
821 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
822 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
756
823 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
824 window_vt_x += sb_w; 758 window_vt_x += sb_w;
825 } 759 }
826 760
827 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
828 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
829 szHint.min_width = szHint.base_width + szHint.width_inc; 763 szHint.min_width = szHint.base_width + szHint.width_inc;
830 szHint.min_height = szHint.base_height + szHint.height_inc; 764 szHint.min_height = szHint.base_height + szHint.height_inc;
831 765
832 if (newwidth && newwidth - szHint.base_width < max_width) 766 if (newwidth && newwidth - szHint.base_width < max_width)
833 { 767 {
834 szHint.width = newwidth; 768 szHint.width = newwidth;
… …
849 { 783 {
850 min_it (height, max_height); 784 min_it (height, max_height);
851 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
852 } 786 }
853 787
854 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
855 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
856 790
857 if (recalc_x) 791 if (recalc_x)
858 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793
859 if (recalc_y) 794 if (recalc_y)
860 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
861 796
862 ncol = width / fwidth; 797 ncol = width / fwidth;
863 nrow = height / fheight; 798 nrow = height / fheight;
864 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
865 ncol, nrow, szHint.width,
866 szHint.height));
867 return;
868} 799}
869 800
870/*----------------------------------------------------------------------*/ 801/*----------------------------------------------------------------------*/
871/* 802/*
872 * Tell the teletype handler what size the window is. 803 * Tell the teletype handler what size the window is.
873 * Called after a window size change. 804 * Called after a window size change.
874 */ 805 */
875void 806void
876rxvt_term::tt_winch () 807rxvt_term::tt_winch ()
877{ 808{
878 if (pty.pty < 0) 809 if (pty->pty < 0)
879 return; 810 return;
880 811
881 struct winsize ws; 812 struct winsize ws;
882 813
883 ws.ws_col = ncol; 814 ws.ws_col = ncol;
884 ws.ws_row = nrow; 815 ws.ws_row = nrow;
885 ws.ws_xpixel = width; 816 ws.ws_xpixel = width;
886 ws.ws_ypixel = height; 817 ws.ws_ypixel = height;
887 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 818 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
888 819
889#if 0 820#if 0
890 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 821 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
891 if (cmd_pid) /* force through to the command */ 822 if (cmd_pid) /* force through to the command */
892 kill (-cmd_pid, SIGWINCH); 823 kill (-cmd_pid, SIGWINCH);
… …
924 delete fontset[0]; 855 delete fontset[0];
925 fontset[0] = fs; 856 fontset[0] = fs;
926 857
927 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
928 prop.height += lineSpace; 859 prop.height += lineSpace;
860
929 fs->set_prop (prop); 861 fs->set_prop (prop, false);
930 862
931 fwidth = prop.width; 863 fwidth = prop.width;
932 fheight = prop.height; 864 fheight = prop.height;
933 fbase = prop.ascent; 865 fbase = prop.ascent;
934 866
… …
943 { 875 {
944 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
945 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
946 878
947 if (res) 879 if (res)
948 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
949 else 884 else
950 { 885 {
951 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
952 887
953 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 888 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
954 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 889 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890
891 fs->set_prop (prop2, true);
955 } 892 }
956 893
957 fs->populate (res);
958 fs->set_prop (prop2);
959 } 894 }
960#else 895#else
961 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
962#endif 897#endif
963 } 898 }
… …
972 return true; 907 return true;
973} 908}
974 909
975void rxvt_term::set_string_property (Atom prop, const char *str, int len) 910void rxvt_term::set_string_property (Atom prop, const char *str, int len)
976{ 911{
977 XChangeProperty (display->display, parent[0], 912 XChangeProperty (dpy, parent[0],
978 prop, XA_STRING, 8, PropModeReplace, 913 prop, XA_STRING, 8, PropModeReplace,
979 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 914 (const unsigned char *)str, len >= 0 ? len : strlen (str));
980} 915}
981 916
982void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
983{ 918{
984 wchar_t *ws = rxvt_mbstowcs (str, len); 919 wchar_t *ws = rxvt_mbstowcs (str, len);
985 char *s = rxvt_wcstoutf8 (ws); 920 char *s = rxvt_wcstoutf8 (ws);
986 921
987 XChangeProperty (display->display, parent[0], 922 XChangeProperty (dpy, parent[0],
988 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
989 (const unsigned char *)s, strlen (s)); 924 (const unsigned char *)s, strlen (s));
990 925
991 free (s); 926 free (s);
992 free (ws); 927 free (ws);
… …
1017void 952void
1018rxvt_term::set_window_color (int idx, const char *color) 953rxvt_term::set_window_color (int idx, const char *color)
1019{ 954{
1020 rxvt_color xcol; 955 rxvt_color xcol;
1021 int i; 956 int i;
1022 957
1023 if (color == NULL || *color == '\0') 958 if (color == NULL || *color == '\0')
1024 return; 959 return;
960
961 color = strdup (color);
962 allocated.push_back ((void *)color);
963 rs[Rs_color + idx] = color;
1025 964
1026 /* handle color aliases */ 965 /* handle color aliases */
1027 if (isdigit (*color)) 966 if (isdigit (*color))
1028 { 967 {
1029 i = atoi (color); 968 i = atoi (color);
1030 969
1031 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
1032 { /* bright colors */ 971 { /* bright colors */
1033 i -= 8; 972 i -= 8;
1034 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1035 SET_PIXCOLOR (idx);
1036 goto done; 974 goto done;
1037 } 975 }
1038 976
1039 if (i >= 0 && i <= 7) 977 if (i >= 0 && i <= 7)
1040 { /* normal colors */ 978 { /* normal colors */
1041 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1042 SET_PIXCOLOR (idx);
1043 goto done; 980 goto done;
1044 } 981 }
1045 } 982 }
1046 983
1047 if (!rXParseAllocColor (&xcol, color)) 984 set_color (xcol, color);
1048 return;
1049
1050 /* XStoreColor (display->display, display->cmap, XColor*); */
1051 985
1052 /* 986 /*
1053 * FIXME: should free colors here, but no idea how to do it so instead, 987 * FIXME: should free colors here, but no idea how to do it so instead,
1054 * so just keep gobbling up the colormap 988 * so just keep gobbling up the colormap
1055 */ 989 */
1056# if 0
1057 for (i = Color_Black; i <= Color_White; i++)
1058 if (pix_colors[idx] == pix_colors[i])
1059 break;
1060 if (i > Color_White)
1061 {
1062 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1063 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1064 DisplayPlanes (display->display, display->screen));
1065 }
1066# endif
1067 990
1068 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
1069 SET_PIXCOLOR (idx);
1070 992
1071 /* XSetWindowAttributes attr; */ 993 /* XSetWindowAttributes attr; */
1072 /* Cursor cursor; */ 994 /* Cursor cursor; */
1073done: 995done:
1074
1075#if OFF_FOCUS_FADING
1076 if (rs[Rs_fade])
1077 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1078#endif
1079
1080 /*TODO: handle Color_BD, scrollbar background, etc. */ 996 /*TODO: handle Color_BD, scrollbar background, etc. */
1081 997
998 update_fade_color (idx);
1082 recolour_cursor (); 999 recolour_cursor ();
1083 scr_recolour (); 1000 scr_recolour ();
1084} 1001}
1085 1002
1086#else 1003#else
… …
1088#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
1089 1006
1090void 1007void
1091rxvt_term::recolour_cursor () 1008rxvt_term::recolour_cursor ()
1092{ 1009{
1093 XColor xcol[2]; 1010 XColor fg, bg;
1094 1011
1095 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1012 (ISSET_PIXCOLOR (Color_pointer_fg)
1096 ? pix_colors_focused[Color_pointer_fg] 1013 ? pix_colors_focused[Color_pointer_fg]
1097 : pix_colors_focused[Color_fg]; 1014 : pix_colors_focused[Color_fg]).get (fg);
1015
1098 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1016 (ISSET_PIXCOLOR (Color_pointer_bg)
1099 ? pix_colors_focused[Color_pointer_bg] 1017 ? pix_colors_focused[Color_pointer_bg]
1100 : pix_colors_focused[Color_bg]; 1018 : pix_colors_focused[Color_bg]).get (bg);
1101 1019
1102 XQueryColors (display->display, display->cmap, xcol, 2); 1020 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1103 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1104} 1021}
1105 1022
1106/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
1107/* 1024/*
1108 * find if fg/bg matches any of the normal (low-intensity) colors 1025 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1112{ 1029{
1113 unsigned int i; 1030 unsigned int i;
1114 const char *xpmb = "\0"; 1031 const char *xpmb = "\0";
1115 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1032 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1116 1033
1117 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1118 strcpy (fstr, "default"); 1034 strcpy (fstr, "default");
1119 strcpy (bstr, "default"); 1035 strcpy (bstr, "default");
1120 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
1121 if (pix_colors[Color_fg] == pix_colors[i]) 1037 if (pix_colors[Color_fg] == pix_colors[i])
1122 { 1038 {
… …
1137 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1053 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1138} 1054}
1139 1055
1140/*----------------------------------------------------------------------*/ 1056/*----------------------------------------------------------------------*/
1141 1057
1142int 1058bool
1143rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::set_color (rxvt_color &color, const char *name)
1144{ 1060{
1145 if (!screen_in_out->set (display, colour)) 1061 if (color.set (this, name))
1146 {
1147 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1148 return false;
1149 }
1150
1151 return true; 1062 return true;
1063
1064 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1065 return false;
1066}
1067
1068void
1069rxvt_term::alias_color (int dst, int src)
1070{
1071 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1152} 1072}
1153 1073
1154/* -------------------------------------------------------------------- * 1074/* -------------------------------------------------------------------- *
1155 * - WINDOW RESIZING - * 1075 * - WINDOW RESIZING - *
1156 * -------------------------------------------------------------------- */ 1076 * -------------------------------------------------------------------- */
1157void 1077void
1158rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1078rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1159{ 1079{
1160 int fix_screen; 1080 int fix_screen;
1161 int old_width = szHint.width, old_height = szHint.height; 1081 int old_width = szHint.width;
1162 dDisp; 1082 int old_height = szHint.height;
1163 1083
1164 window_calc (newwidth, newheight); 1084 window_calc (newwidth, newheight);
1085
1086 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1165 XSetWMNormalHints (disp, parent[0], &szHint); 1087 XSetWMNormalHints (dpy, parent[0], &szHint);
1166 1088
1167 if (!ignoreparent) 1089 if (!ignoreparent)
1168 { 1090 {
1169#ifdef SMART_RESIZE 1091#ifdef SMART_RESIZE
1170 /* 1092 /*
… …
1174 int x, y, x1, y1; 1096 int x, y, x1, y1;
1175 int dx, dy; 1097 int dx, dy;
1176 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1177 Window unused_cr; 1099 Window unused_cr;
1178 1100
1179 XTranslateCoordinates (disp, parent[0], display->root, 1101 XTranslateCoordinates (dpy, parent[0], display->root,
1180 0, 0, &x, &y, &unused_cr); 1102 0, 0, &x, &y, &unused_cr);
1181 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1182 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1183 /* 1105 /*
1184 * if display->root isn't the parent window, a WM will probably have offset 1106 * if display->root isn't the parent window, a WM will probably have offset
1185 * our position for handles and decorations. Counter it 1107 * our position for handles and decorations. Counter it
1186 */ 1108 */
… …
1188 { 1110 {
1189 x -= x1; 1111 x -= x1;
1190 y -= y1; 1112 y -= y1;
1191 } 1113 }
1192 1114
1193 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1115 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1194 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1116 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1195 dx = old_width - szHint.width; 1117 dx = old_width - szHint.width;
1196 dy = old_height - szHint.height; 1118 dy = old_height - szHint.height;
1197 1119
1198 /* Check position of the center of the window */ 1120 /* Check position of the center of the window */
1199 if (x < x1) /* left half */ 1121 if (x < x1) /* left half */
1200 dx = 0; 1122 dx = 0;
… …
1203 if (y < y1) /* top half */ 1125 if (y < y1) /* top half */
1204 dy = 0; 1126 dy = 0;
1205 else if (y == y1) /* exact center */ 1127 else if (y == y1) /* exact center */
1206 dy /= 2; 1128 dy /= 2;
1207 1129
1208 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1209 szHint.width, szHint.height); 1131 szHint.width, szHint.height);
1210#else 1132#else
1211 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1212#endif 1134#endif
1213 } 1135 }
1214 1136
1215 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1216 1138
1217 if (fix_screen || newwidth != old_width || newheight != old_height) 1139 if (fix_screen || newwidth != old_width || newheight != old_height)
1218 { 1140 {
1219 if (scrollBar.state) 1141 if (scrollBar.state)
1220 { 1142 {
1221 XMoveResizeWindow (disp, scrollBar.win, 1143 XMoveResizeWindow (dpy, scrollBar.win,
1222 window_sb_x, 0, 1144 window_sb_x, 0,
1223 scrollbar_TotalWidth (), szHint.height); 1145 scrollbar_TotalWidth (), szHint.height);
1224 resize_scrollbar (); 1146 resize_scrollbar ();
1225 } 1147 }
1226 1148
1227 XMoveResizeWindow (disp, vt, 1149 XMoveResizeWindow (dpy, vt,
1228 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1229 width, height); 1151 width, height);
1230 1152
1153#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1231 scr_clear (); 1159 scr_clear ();
1232#ifdef XPM_BACKGROUND
1233 resize_pixmap ();
1234#endif
1235 } 1160 }
1236 1161
1237 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1238 {
1239 int curr_screen = -1;
1240 int old_ncol = prev_ncol;
1241
1242 /* scr_reset only works on the primary screen */
1243 if (old_height) /* this is not the first time through */
1244 {
1245 unsigned int ocol = ncol;
1246 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1247 curr_screen = scr_change_screen (PRIMARY);
1248 ncol = ocol;
1249 }
1250
1251 scr_reset (); 1163 scr_reset ();
1252 1164
1253 if (curr_screen >= 0) /* this is not the first time through */ 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1254 { 1166 //scr_touch (false);
1255 scr_change_screen (curr_screen);
1256 selection_check (old_ncol != ncol ? 4 : 0);
1257 }
1258 }
1259 1167
1260 old_width = szHint.width; 1168#ifdef HAVE_BG_PIXMAP
1261 old_height = szHint.height; 1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1262 1170// if (bgPixmap.pixmap)
1263#ifdef XPM_BACKGROUND
1264 if (pixmap)
1265 scr_touch (false); 1171// scr_touch (false);
1266#endif 1172#endif
1267 1173
1268#ifdef USE_XIM 1174#ifdef USE_XIM
1269 IMSetStatusPosition (); 1175 IMSetPosition ();
1270#endif 1176#endif
1271} 1177}
1272 1178
1273/* 1179/*
1274 * Set the width/height of the vt window in characters. Units are pixels. 1180 * Set the width/height of the vt window in characters. Units are pixels.
… …
1279{ 1185{
1280 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1281 1187
1282 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1283 { 1189 {
1284 XGetWindowAttributes (display->display, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1285 1191
1286 if (newwidth == 0) 1192 if (newwidth == 0)
1287 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1288 if (newheight == 0) 1194 if (newheight == 0)
1289 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1303#ifdef USE_XIM 1209#ifdef USE_XIM
1304 1210
1305void 1211void
1306rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1212rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1307{ 1213{
1308 fg = pix_colors[Color_fg]; 1214 fg = pix_colors [Color_fg];
1309 bg = pix_colors[Color_bg]; 1215 bg = pix_colors [Color_bg];
1310} 1216}
1311 1217
1312void 1218void
1313rxvt_term::im_set_size (XRectangle &size) 1219rxvt_term::im_set_size (XRectangle &size)
1314{ 1220{
… …
1351 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1352 1258
1353 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1354 *p = '\0'; 1260 *p = '\0';
1355 1261
1356 atom = XInternAtom (display->display, server, False); 1262 atom = XInternAtom (dpy, server, False);
1357 win = XGetSelectionOwner (display->display, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1358 1264
1359 if (win != None) 1265 if (win != None)
1360 return True; 1266 return True;
1361 } 1267 }
1362 1268
… …
1369 XPoint nspot; 1275 XPoint nspot;
1370 XVaNestedList preedit_attr; 1276 XVaNestedList preedit_attr;
1371 1277
1372 if (!Input_Context 1278 if (!Input_Context
1373 || !focus 1279 || !focus
1374 || !(input_style & XIMPreeditPosition)) 1280 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1375 return; 1281 return;
1376 1282
1377 im_set_position (nspot); 1283 im_set_position (nspot);
1378 1284
1379 if (nspot.x == spot.x && nspot.y == spot.y) 1285 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1398 input_method = 0; 1304 input_method = 0;
1399 } 1305 }
1400 1306
1401 Input_Context = 0; 1307 Input_Context = 0;
1402} 1308}
1309
1310#ifdef ENABLE_XIM_ONTHESPOT
1311
1312static void
1313xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1314{
1315 ((rxvt_term *)client_data)->make_current ();
1316 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1317}
1318
1319static void
1320xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1324}
1325
1326static void
1327xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1328{
1329 rxvt_term *term = (rxvt_term *)client_data;
1330 XIMText *text = call_data->text;
1331
1332 term->make_current ();
1333
1334 if (text)
1335 {
1336 void *str;
1337
1338 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 {
1340 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]);
1343
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1346
1347 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale);
1349 }
1350 else
1351 str = (void *)text->string.wide_char;
1352
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1358 DT_WCS_LEN, str, str ? (int)text->length : 0,
1359 DT_END));
1360 }
1361 else
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length,
1366 DT_END));
1367}
1368
1369#if 0
1370static void
1371xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1372{
1373 ((rxvt_term *)client_data)->make_current ();
1374 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1375 DT_INT, call_data->position,
1376 DT_INT, call_data->direction,
1377 DT_INT, call_data->style,
1378 DT_END));
1379}
1380#endif
1381
1382#endif
1403 1383
1404/* 1384/*
1405 * Try to open a XIM with the current modifiers, then see if we can 1385 * Try to open a XIM with the current modifiers, then see if we can
1406 * open a suitable preedit type 1386 * open a suitable preedit type
1407 */ 1387 */
… …
1414 XRectangle rect, status_rect, needed_rect; 1394 XRectangle rect, status_rect, needed_rect;
1415 unsigned long fg, bg; 1395 unsigned long fg, bg;
1416 const char *p; 1396 const char *p;
1417 char **s; 1397 char **s;
1418 XIMStyles *xim_styles; 1398 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1419 1402
1420 set_environ (envv); 1403 set_environ (envv);
1421 1404
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1406 return false;
1424 1407
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426 input_method = display->get_xim (locale, modifiers); 1408 input_method = display->get_xim (locale, modifiers);
1427 if (input_method == NULL) 1409 if (input_method == NULL)
1428 return false; 1410 return false;
1429 1411
1430 xim = input_method->xim; 1412 xim = input_method->xim;
… …
1450 s = rxvt_splitcommastring (p); 1432 s = rxvt_splitcommastring (p);
1451 1433
1452 for (i = found = 0; !found && s[i]; i++) 1434 for (i = found = 0; !found && s[i]; i++)
1453 { 1435 {
1454 if (!strcmp (s[i], "OverTheSpot")) 1436 if (!strcmp (s[i], "OverTheSpot"))
1455 input_style = (XIMPreeditPosition | XIMStatusNothing); 1437 input_style = XIMPreeditPosition | XIMStatusNothing;
1456 else if (!strcmp (s[i], "OffTheSpot")) 1438 else if (!strcmp (s[i], "OffTheSpot"))
1457 input_style = (XIMPreeditArea | XIMStatusArea); 1439 input_style = XIMPreeditArea | XIMStatusArea;
1458 else if (!strcmp (s[i], "Root")) 1440 else if (!strcmp (s[i], "Root"))
1459 input_style = (XIMPreeditNothing | XIMStatusNothing); 1441 input_style = XIMPreeditNothing | XIMStatusNothing;
1460 else if (!strcmp (s[i], "None")) 1442 else if (!strcmp (s[i], "None"))
1461 input_style = (XIMPreeditNone | XIMStatusNone); 1443 input_style = XIMPreeditNone | XIMStatusNone;
1444#ifdef ENABLE_XIM_ONTHESPOT
1445 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1446 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1447#endif
1448 else
1449 input_style = XIMPreeditNothing | XIMStatusNothing;
1462 1450
1463 for (j = 0; j < xim_styles->count_styles; j++) 1451 for (j = 0; j < xim_styles->count_styles; j++)
1464 if (input_style == xim_styles->supported_styles[j]) 1452 if (input_style == xim_styles->supported_styles[j])
1465 { 1453 {
1466 rxvt_freecommastring (s); 1454 rxvt_freecommastring (s);
… …
1504 "*", 1492 "*",
1505 fheight, 1493 fheight,
1506 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1507 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1508 1496
1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1510 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1511 1499
1512 if (missing_charset_list) 1500 if (missing_charset_list)
1513 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1514 1502
… …
1555 XNBackground, bg, 1543 XNBackground, bg,
1556 XNArea, &status_rect, 1544 XNArea, &status_rect,
1557 XNFontSet, fs, 1545 XNFontSet, fs,
1558 NULL); 1546 NULL);
1559 } 1547 }
1548#if ENABLE_XIM_ONTHESPOT
1549 else if (input_style & XIMPreeditCallbacks)
1550 {
1551 im_set_position (spot);
1552
1553 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1554 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1555 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1556# if 0
1557 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1558# endif
1559
1560 preedit_attr = XVaCreateNestedList (0,
1561 XNSpotLocation, &spot,
1562 XNPreeditStartCallback, &xcb[0],
1563 XNPreeditDoneCallback , &xcb[1],
1564 XNPreeditDrawCallback , &xcb[2],
1565# if 0
1566 XNPreeditCaretCallback, &xcb[3],
1567# endif
1568 NULL);
1569 }
1570#endif
1560 1571
1561 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1562 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1563 XNClientWindow, vt, 1574 XNClientWindow, vt,
1564 XNFocusWindow, parent[0], 1575 XNFocusWindow, parent[0],
… …
1566 preedit_attr, 1577 preedit_attr,
1567 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1568 status_attr, NULL); 1579 status_attr, NULL);
1569 1580
1570 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1571 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1572 if (fs) XFreeFontSet (display->display, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1573 1584
1574 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1575 { 1586 {
1576 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1577 im_destroy (); 1588 im_destroy ();
1578 return false; 1589 return false;
1579 } 1590 }
1580 1591
1581 if (input_style & XIMPreeditArea) 1592#if 0
1593 // unfortunately, only the focus window is used by XIM, hard to fix
1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1595 vt_select_input ();
1596#endif
1597
1582 IMSetStatusPosition (); 1598 IMSetPosition ();
1583 1599
1584 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1585 return true; 1600 return true;
1586} 1601}
1587 1602
1588void 1603void
1589rxvt_term::im_cb () 1604rxvt_term::im_cb ()
… …
1595 1610
1596 make_current (); 1611 make_current ();
1597 1612
1598 im_destroy (); 1613 im_destroy ();
1599 1614
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1615 if (Input_Context)
1602 return; 1616 return;
1603 1617
1604#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1618#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1605 if (rs[Rs_imLocale]) 1619 if (rs[Rs_imLocale])
… …
1647 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1648#endif 1662#endif
1649} 1663}
1650 1664
1651void 1665void
1652rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1653{ 1667{
1654 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1655 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1656 1670
1657 if (!Input_Context 1671 if (!Input_Context
1658 || !focus 1672 || !focus
1659 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1660 || !IMisRunning ()) 1674 || !IMisRunning ())
1661 return; 1675 return;
1662 1676
1677 if (input_style & XIMPreeditPosition)
1678 {
1679 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681
1682 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL);
1684 }
1685 else
1686 {
1663 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1664 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1665 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1666 XFree (status_attr); 1690 XFree (status_attr);
1667 1691
1668 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1669 XFree (needed_rect); 1693 XFree (needed_rect);
1670 1694
1671 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1672 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1673 1697
1674 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1675 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1676 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1677 1702
1703 XFree (status_attr);
1704 }
1705
1678 XFree (preedit_attr); 1706 XFree (preedit_attr);
1679 XFree (status_attr);
1680} 1707}
1681#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1682 1709
1683/*----------------------------------------------------------------------*/
1684rxvt_t rxvt_current_term;
1685
1686/*----------------------- end-of-file (C source) -----------------------*/ 1710/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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