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.178 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.253 by ayin, Mon Oct 15 07:33:48 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 MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 164#endif
172#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 166 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
185 pointer_ev (this, &rxvt_term::pointer_cb), 178 pointer_ev (this, &rxvt_term::pointer_cb),
186#endif 179#endif
187#ifdef USE_XIM 180#ifdef USE_XIM
188 im_ev (this, &rxvt_term::im_cb), 181 im_ev (this, &rxvt_term::im_cb),
189#endif 182#endif
183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb),
185#endif
190 termwin_ev (this, &rxvt_term::x_cb), 186 termwin_ev (this, &rxvt_term::x_cb),
191 vt_ev (this, &rxvt_term::x_cb), 187 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb),
192 check_ev (this, &rxvt_term::check_cb), 189 check_ev (this, &rxvt_term::check_cb),
193 flush_ev (this, &rxvt_term::flush_cb), 190 flush_ev (this, &rxvt_term::flush_cb),
194 destroy_ev (this, &rxvt_term::destroy_cb), 191 destroy_ev (this, &rxvt_term::destroy_cb),
195 pty_ev (this, &rxvt_term::pty_cb), 192 pty_ev (this, &rxvt_term::pty_cb),
196 incr_ev (this, &rxvt_term::incr_cb) 193 incr_ev (this, &rxvt_term::incr_cb)
… …
199 196
200 termlist.push_back (this); 197 termlist.push_back (this);
201 198
202#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
203 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
204
205 if (!keyboard)
206 rxvt_fatal ("out of memory, aborting.\n");
207#endif 201#endif
208} 202}
209 203
210// 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.
211// for use before an emergency exit 205// for use before an emergency exit
206void
212void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
213{ 208{
214 if (cmd_pid) 209 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
216 211
217#ifdef UTMP_SUPPORT 212 pty_ev.stop ();
218 privileged_utmp (RESTORE); 213 delete pty; pty = 0;
219#endif
220
221 pty.put ();
222} 214}
223 215
224rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
225{ 217{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
229 219
230 emergency_cleanup (); 220 emergency_cleanup ();
231 221
232#if ENABLE_STYLES 222#if ENABLE_STYLES
… …
236#endif 226#endif
237 delete fontset[0]; 227 delete fontset[0];
238 228
239 if (display) 229 if (display)
240 { 230 {
241 dDisp;
242
243 selection_clear (); 231 selection_clear ();
244 232
245#ifdef USE_XIM 233#ifdef USE_XIM
246 im_destroy (); 234 im_destroy ();
247#endif 235#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif
251#ifdef XTERM_SCROLLBAR 236#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 237 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 238 if (ShadowGC) XFreeGC (dpy, ShadowGC);
254#endif 239#endif
255#ifdef PLAIN_SCROLLBAR 240#ifdef PLAIN_SCROLLBAR
256 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 241 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
257#endif 242#endif
258#ifdef NEXT_SCROLLBAR 243#ifdef NEXT_SCROLLBAR
259 if (blackGC) XFreeGC (disp, blackGC); 244 if (blackGC) XFreeGC (dpy, blackGC);
260 if (whiteGC) XFreeGC (disp, whiteGC); 245 if (whiteGC) XFreeGC (dpy, whiteGC);
261 if (grayGC) XFreeGC (disp, grayGC); 246 if (grayGC) XFreeGC (dpy, grayGC);
262 if (darkGC) XFreeGC (disp, darkGC); 247 if (darkGC) XFreeGC (dpy, darkGC);
263 if (stippleGC) XFreeGC (disp, stippleGC); 248 if (stippleGC) XFreeGC (dpy, stippleGC);
264 if (dimple) XFreePixmap (disp, dimple); 249 if (dimple) XFreePixmap (dpy, dimple);
265 if (upArrow) XFreePixmap (disp, upArrow); 250 if (upArrow) XFreePixmap (dpy, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 251 if (downArrow) XFreePixmap (dpy, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 252 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 253 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
269#endif 254#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 256 if (topShadowGC) XFreeGC (dpy, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 257 if (botShadowGC) XFreeGC (dpy, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 258 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
274#endif 259#endif
275 if (gc) XFreeGC (disp, gc); 260 if (gc) XFreeGC (dpy, gc);
276 261
277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278 delete menuBar.drawable;
279 //if (menuBar.win)
280 // XDestroyWindow (disp, menuBar.win);
281#endif
282 delete drawable; 262 delete drawable;
283 // destroy all windows 263 // destroy all windows
284 if (parent[0]) 264 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 265 XDestroyWindow (dpy, parent[0]);
286 }
287 266
288 // TODO: free pixcolours, colours should become part of rxvt_display 267 for (int i = 0; i < TOTAL_COLORS; i++)
289 delete pix_colors_focused; 268 if (ISSET_PIXCOLOR (i))
269 {
270 pix_colors_focused [i].free (this);
290#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
272 pix_colors_unfocused [i].free (this);
273#endif
274 }
275
276 clear ();
277 }
278
279 delete [] pix_colors_focused;
280#if OFF_FOCUS_FADING
291 delete pix_colors_unfocused; 281 delete [] pix_colors_unfocused;
292#endif 282#endif
293 283
294 displays.put (display); 284 displays.put (display);
295 285
296 scr_release (); 286 scr_release ();
… …
299 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
300 free (allocated [i]); 290 free (allocated [i]);
301 291
302 free (selection.text); 292 free (selection.text);
303 // TODO: manage env vars in child only(!) 293 // TODO: manage env vars in child only(!)
304 free (env_windowid);
305 free (env_display); 294 free (env_display);
306 free (env_term); 295 free (env_term);
307 free (env_colorfgbg);
308 free (locale); 296 free (locale);
309 free (v_buffer); 297 free (v_buffer);
310 free (incr_buf); 298 free (incr_buf);
311 299
312 delete envv; 300 delete envv;
… …
315#ifdef KEYSYM_RESOURCE 303#ifdef KEYSYM_RESOURCE
316 delete keyboard; 304 delete keyboard;
317#endif 305#endif
318} 306}
319 307
308// child has exited, usually destroys
320void 309void
321rxvt_term::child_exit () 310rxvt_term::child_cb (child_watcher &w, int status)
322{ 311{
312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313
323 cmd_pid = 0; 314 cmd_pid = 0;
324 315
325 if (!OPTION (Opt_hold)) 316 if (!option (Opt_hold))
326 destroy (); 317 destroy ();
327} 318}
328 319
329void 320void
330rxvt_term::destroy () 321rxvt_term::destroy ()
331{ 322{
332 if (destroy_ev.active) 323 if (destroy_ev.active)
333 return; 324 return;
334 325
326 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327
335#if ENABLE_OVERLAY 328#if ENABLE_OVERLAY
336 scr_overlay_off (); 329 scr_overlay_off ();
337#endif 330#endif
338 331
339 if (display) 332 if (display)
… …
342 im_ev.stop (display); 335 im_ev.stop (display);
343#endif 336#endif
344#if HAVE_SCROLLBARS 337#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 338 scrollbar_ev.stop (display);
346#endif 339#endif
347#if MENUBAR 340#if ENABLE_TRANSPARENCY || ENABLE_PERL
348 menubar_ev.stop (display);
349#endif
350#if TRANSPARENT
351 rootwin_ev.stop (display); 341 rootwin_ev.stop (display);
352#endif 342#endif
353 incr_ev.stop (); 343 incr_ev.stop ();
354 termwin_ev.stop (display); 344 termwin_ev.stop (display);
355 vt_ev.stop (display); 345 vt_ev.stop (display);
… …
396{ 386{
397 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
398 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
399} 389}
400 390
401#if ENABLE_FRILLS 391#if !ENABLE_MINIMAL
402static void 392static void
403print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
404{ 394{
405 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
406 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
… …
454 GET_R->allowedxerror = event->error_code; 444 GET_R->allowedxerror = event->error_code;
455 else 445 else
456 { 446 {
457 // GET_R is most likely not the terminal which caused the error, 447 // GET_R is most likely not the terminal which caused the error,
458 // so just output the error and continue 448 // so just output the error and continue
459#if ENABLE_FRILLS 449#if ENABLE_MINIMAL
450 old_xerror_handler (display, event);
451#else
460 print_x_error (display, event); 452 print_x_error (display, event);
461#else
462 old_xerror_handler (display, event);
463#endif 453#endif
464 } 454 }
465 455
466 return 0; 456 return 0;
467} 457}
… …
475 _exit (EXIT_FAILURE); 465 _exit (EXIT_FAILURE);
476} 466}
477 467
478/*----------------------------------------------------------------------*/ 468/*----------------------------------------------------------------------*/
479bool 469bool
480rxvt_term::init (int argc, const char *const *argv) 470rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
481{ 471{
472 this->envv = envv;
473
482 SET_R (this); 474 SET_R (this);
483 set_locale (""); 475 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :( 476 set_environ (envv); // few things in X do not call setlocale :(
485 477
486 if (!init_vars ()) 478 if (!init_vars ())
… …
492 484
493#ifdef KEYSYM_RESOURCE 485#ifdef KEYSYM_RESOURCE
494 keyboard->register_done (); 486 keyboard->register_done ();
495#endif 487#endif
496 488
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 490 if (option (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
503#endif 492#endif
504 493
494 pty = ptytty::create ();
495
496 create_windows (argc, argv);
497
498 init_xlocale ();
499
500 scr_reset (); // initialize screen
501
502#if 0
503 XSynchronize (dpy, True);
504#endif
505
506#ifdef HAVE_SCROLLBARS
507 if (option (Opt_scrollBar))
508 resize_scrollbar (); /* create and map scrollbar */
509#endif
510#ifdef HAVE_BG_PIXMAP
511 {
512 bgPixmap.set_target (this);
513
514#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent))
516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526
527 bgPixmap.set_root_pixmap ();
528 XSelectInput (dpy, display->root, PropertyChangeMask);
529 rootwin_ev.start (display, display->root);
530 }
531#endif
532
533#ifdef BG_IMAGE_FROM_FILE
534 if (rs[Rs_backgroundPixmap] != NULL)
535 {
536 const char *p = rs[Rs_backgroundPixmap];
537
538 if ((p = strchr (p, ';')) != NULL)
539 {
540 p++;
541 bgPixmap.set_geometry (p);
542 }
543 else
544 bgPixmap.set_defaultGeometry ();
545
546 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547 if (!bgPixmap.window_position_sensitive ())
548 update_background ();
549 }
550#endif
551 }
552#endif
553
505#if ENABLE_PERL 554#if ENABLE_PERL
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
531
532 create_windows (argc, argv);
533
534 dDisp;
535
536 init_xlocale ();
537
538 scr_reset (); // initialize screen
539
540#if 0
541 XSynchronize (disp, True);
542#endif
543
544#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */
547#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif
552#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent))
554 {
555 XSelectInput (disp, display->root, PropertyChangeMask);
556 check_our_parents ();
557 rootwin_ev.start (display, display->root); 555 rootwin_ev.start (display, display->root);
558 }
559#endif 556#endif
560
561 XMapWindow (disp, vt);
562 XMapWindow (disp, parent[0]);
563 557
564 set_colorfgbg (); 558 set_colorfgbg ();
565 559
566 init_command (cmd_argv); 560 init_command (cmd_argv);
567 561
568 free (cmd_argv); 562 free (cmd_argv);
569 563
570 if (pty.pty >= 0) 564 if (pty->pty >= 0)
571 pty_ev.start (pty.pty, EVENT_READ); 565 pty_ev.start (pty->pty, EVENT_READ);
572 566
573 check_ev.start (); 567 check_ev.start ();
574 568
575 HOOK_INVOKE ((this, HOOK_START, DT_END)); 569 HOOK_INVOKE ((this, HOOK_START, DT_END));
576 570
571#if ENABLE_XEMBED
572 if (rs[Rs_embed])
573 {
574 long info[2] = { 0, XEMBED_MAPPED };
575
576 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
577 32, PropModeReplace, (unsigned char *)&info, 2);
578 }
579#endif
580
581 XMapWindow (dpy, vt);
582 XMapWindow (dpy, parent[0]);
583
577 return true; 584 return true;
578} 585}
579 586
580static struct sig_handlers 587static struct sig_handlers
581{ 588{
582 sig_watcher sw_chld, sw_term, sw_int; 589 sig_watcher sw_term, sw_int;
583 590
584 void sig_chld (sig_watcher &w)
585 {
586 // we are being called for every SIGCHLD, find the corresponding term
587 int pid;
588
589 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
590 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
591 if (pid == (*t)->cmd_pid)
592 {
593 (*t)->child_exit ();
594 break;
595 }
596 }
597
598 /* 591 /*
599 * Catch a fatal signal and tidy up before quitting 592 * Catch a fatal signal and tidy up before quitting
600 */ 593 */
601 void 594 void
602 sig_term (sig_watcher &w) 595 sig_term (sig_watcher &w)
603 { 596 {
604#ifdef DEBUG_CMD
605 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
606#endif
607 rxvt_emergency_cleanup (); 597 rxvt_emergency_cleanup ();
608 signal (w.signum, SIG_DFL); 598 signal (w.signum, SIG_DFL);
609 kill (getpid (), w.signum); 599 kill (getpid (), w.signum);
610 } 600 }
611 601
612 sig_handlers () 602 sig_handlers ()
613 : sw_chld (this, &sig_handlers::sig_chld),
614 sw_term (this, &sig_handlers::sig_term), 603 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 604 sw_int (this, &sig_handlers::sig_term)
616 { 605 {
617 } 606 }
618} sig_handlers; 607} sig_handlers;
619 608
620char **rxvt_environ; // startup environment 609char **rxvt_environ; // startup environment
621 610
622void 611void
623rxvt_init () 612rxvt_init ()
624{ 613{
614 ptytty::init ();
615
625 rxvt_environ = environ; 616 rxvt_environ = environ;
626
627 /*
628 * Save and then give up any super-user privileges
629 * If we need privileges in any area then we must specifically request it.
630 * We should only need to be root in these cases:
631 * 1. write utmp entries on some systems
632 * 2. chown tty on some systems
633 */
634 rxvt_privileges (SAVE);
635 rxvt_privileges (IGNORE);
636 617
637 signal (SIGHUP, SIG_IGN); 618 signal (SIGHUP, SIG_IGN);
638 signal (SIGPIPE, SIG_IGN); 619 signal (SIGPIPE, SIG_IGN);
639 620
640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM); 621 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT); 622 sig_handlers.sw_int.start (SIGINT);
643 623
644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
645 /* signal (SIGURG, SIG_DFL); */ 625 /* signal (SIGURG, SIG_DFL); */
… …
674 rxvt_fatal ("memory allocation failure. aborting.\n"); 654 rxvt_fatal ("memory allocation failure. aborting.\n");
675 655
676 return p; 656 return p;
677} 657}
678 658
679void * 659void *
680rxvt_realloc (void *ptr, size_t size) 660rxvt_realloc (void *ptr, size_t size)
681{ 661{
682 void *p = realloc (ptr, size); 662 void *p = realloc (ptr, size);
683 663
684 if (!p) 664 if (!p)
685 rxvt_fatal ("memory allocation failure. aborting.\n"); 665 rxvt_fatal ("memory allocation failure. aborting.\n");
686 666
687 return p; 667 return p;
688} 668}
689 669
690/* ------------------------------------------------------------------------- *
691 * PRIVILEGED OPERATIONS *
692 * ------------------------------------------------------------------------- */
693/* take care of suid/sgid super-user (root) privileges */
694void
695rxvt_privileges (rxvt_privaction action)
696{
697#if ! defined(__CYGWIN32__)
698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
699 /* setreuid () is the poor man's setuid (), seteuid () */
700# define seteuid(a) setreuid(-1, (a))
701# define setegid(a) setregid(-1, (a))
702# define HAVE_SETEUID
703# endif
704# ifdef HAVE_SETEUID
705 switch (action)
706 {
707 case IGNORE:
708 /*
709 * change effective uid/gid - not real uid/gid - so we can switch
710 * back to root later, as required
711 */
712 setegid (getgid ());
713 seteuid (getuid ());
714 break;
715 case SAVE:
716 saved_egid = getegid ();
717 saved_euid = geteuid ();
718 break;
719 case RESTORE:
720 setegid (saved_egid);
721 seteuid (saved_euid);
722 break;
723 }
724# else
725 switch (action)
726 {
727 case IGNORE:
728 setgid (getgid ());
729 setuid (getuid ());
730 /* FALLTHROUGH */
731 case SAVE:
732 /* FALLTHROUGH */
733 case RESTORE:
734 break;
735 }
736# endif
737#endif
738}
739
740#ifdef UTMP_SUPPORT
741void
742rxvt_term::privileged_utmp (rxvt_privaction action)
743{
744 if (OPTION (Opt_utmpInhibit)
745 || !pty.name || !*pty.name)
746 return;
747
748 rxvt_privileges (RESTORE);
749
750 if (action == SAVE)
751 makeutent (pty.name, rs[Rs_display_name]);
752 else
753 cleanutent ();
754
755 rxvt_privileges (IGNORE);
756}
757#endif
758
759/*----------------------------------------------------------------------*/ 670/*----------------------------------------------------------------------*/
760/* 671/*
761 * window size/position calculcations for XSizeHint and other storage. 672 * window size/position calculations for XSizeHint and other storage.
762 * if width/height are non-zero then override calculated width/height 673 * if width/height are non-zero then override calculated width/height
763 */ 674 */
764void 675void
765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
766{ 677{
767 short recalc_x, recalc_y; 678 short recalc_x, recalc_y;
768 int x, y, sb_w, mb_h, flags; 679 int x, y, sb_w, flags;
769 unsigned int w, h; 680 unsigned int w, h;
770 unsigned int max_width, max_height; 681 unsigned int max_width, max_height;
771 dDisp;
772
773 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
774 ncol, nrow, szHint.width, szHint.height));
775 682
776 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 683 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
777 szHint.win_gravity = NorthWestGravity; 684 szHint.win_gravity = NorthWestGravity;
778 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 685 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
779 686
… …
834 max_width = MAX_COLS * fwidth; 741 max_width = MAX_COLS * fwidth;
835 max_height = MAX_ROWS * fheight; 742 max_height = MAX_ROWS * fheight;
836 743
837 szHint.base_width = szHint.base_height = 2 * int_bwidth; 744 szHint.base_width = szHint.base_height = 2 * int_bwidth;
838 745
839 sb_w = mb_h = 0; 746 sb_w = 0;
840 window_vt_x = window_vt_y = int_bwidth; 747 window_vt_x = window_vt_y = int_bwidth;
841 748
842 if (scrollbar_visible ()) 749 if (scrollBar.state)
843 { 750 {
844 sb_w = scrollbar_TotalWidth (); 751 sb_w = scrollbar_TotalWidth ();
845 szHint.base_width += sb_w; 752 szHint.base_width += sb_w;
753
846 if (!OPTION (Opt_scrollBar_right)) 754 if (!option (Opt_scrollBar_right))
847 window_vt_x += sb_w; 755 window_vt_x += sb_w;
848 } 756 }
849 757
850 if (menubar_visible ())
851 {
852 mb_h = menuBar_TotalHeight ();
853 szHint.base_height += mb_h;
854 window_vt_y += mb_h;
855 }
856
857 szHint.width_inc = fwidth; 758 szHint.width_inc = fwidth;
858 szHint.height_inc = fheight; 759 szHint.height_inc = fheight;
859 szHint.min_width = szHint.base_width + szHint.width_inc; 760 szHint.min_width = szHint.base_width + szHint.width_inc;
860 szHint.min_height = szHint.base_height + szHint.height_inc; 761 szHint.min_height = szHint.base_height + szHint.height_inc;
861 762
862 if (newwidth && newwidth - szHint.base_width < max_width) 763 if (newwidth && newwidth - szHint.base_width < max_width)
863 { 764 {
864 szHint.width = newwidth; 765 szHint.width = newwidth;
… …
879 { 780 {
880 min_it (height, max_height); 781 min_it (height, max_height);
881 szHint.height = szHint.base_height + height; 782 szHint.height = szHint.base_height + height;
882 } 783 }
883 784
884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 785 if (scrollBar.state && option (Opt_scrollBar_right))
885 window_sb_x = szHint.width - sb_w; 786 window_sb_x = szHint.width - sb_w;
886 787
887 if (recalc_x) 788 if (recalc_x)
888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
790
889 if (recalc_y) 791 if (recalc_y)
890 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 792 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
891 793
892 ncol = width / fwidth; 794 ncol = width / fwidth;
893 nrow = height / fheight; 795 nrow = height / fheight;
894 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
895 ncol, nrow, szHint.width,
896 szHint.height));
897 return;
898} 796}
899 797
900/*----------------------------------------------------------------------*/ 798/*----------------------------------------------------------------------*/
901/* 799/*
902 * Tell the teletype handler what size the window is. 800 * Tell the teletype handler what size the window is.
903 * Called after a window size change. 801 * Called after a window size change.
904 */ 802 */
905void 803void
906rxvt_term::tt_winch () 804rxvt_term::tt_winch ()
907{ 805{
908 if (pty.pty < 0) 806 if (pty->pty < 0)
909 return; 807 return;
910 808
911 struct winsize ws; 809 struct winsize ws;
912 810
913 ws.ws_col = ncol; 811 ws.ws_col = ncol;
914 ws.ws_row = nrow; 812 ws.ws_row = nrow;
915 ws.ws_xpixel = width; 813 ws.ws_xpixel = width;
916 ws.ws_ypixel = height; 814 ws.ws_ypixel = height;
917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 815 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
918 816
919#if 0 817#if 0
920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 818 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
921 if (cmd_pid) /* force through to the command */ 819 if (cmd_pid) /* force through to the command */
922 kill (-cmd_pid, SIGWINCH); 820 kill (-cmd_pid, SIGWINCH);
… …
954 delete fontset[0]; 852 delete fontset[0];
955 fontset[0] = fs; 853 fontset[0] = fs;
956 854
957 prop = (*fs)[1]->properties (); 855 prop = (*fs)[1]->properties ();
958 prop.height += lineSpace; 856 prop.height += lineSpace;
857
959 fs->set_prop (prop); 858 fs->set_prop (prop, false);
960 859
961 fwidth = prop.width; 860 fwidth = prop.width;
962 fheight = prop.height; 861 fheight = prop.height;
963 fbase = prop.ascent; 862 fbase = prop.ascent;
964 863
… …
973 { 872 {
974 fontset[style] = fs = new rxvt_fontset (this); 873 fontset[style] = fs = new rxvt_fontset (this);
975 rxvt_fontprop prop2 = prop; 874 rxvt_fontprop prop2 = prop;
976 875
977 if (res) 876 if (res)
978 prop2.weight = prop2.slant = rxvt_fontprop::unset; 877 {
878 fs->populate (res);
879 fs->set_prop (prop2, false);
880 }
979 else 881 else
980 { 882 {
981 res = fontset[0]->fontdesc; 883 fs->populate (fontset[0]->fontdesc);
982 884
983 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 885 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
984 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 886 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
887
888 fs->set_prop (prop2, true);
985 } 889 }
986 890
987 fs->populate (res);
988 fs->set_prop (prop2);
989 } 891 }
990#else 892#else
991 fontset[style] = fontset[0]; 893 fontset[style] = fontset[0];
992#endif 894#endif
993 } 895 }
… …
1000 } 902 }
1001 903
1002 return true; 904 return true;
1003} 905}
1004 906
907void
1005void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908rxvt_term::set_string_property (Atom prop, const char *str, int len)
1006{ 909{
1007 XChangeProperty (display->display, parent[0], 910 XChangeProperty (dpy, parent[0],
1008 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
1009 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1010} 913}
1011 914
915void
1012void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 916rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1013{ 917{
1014 wchar_t *ws = rxvt_mbstowcs (str, len); 918 wchar_t *ws = rxvt_mbstowcs (str, len);
1015 char *s = rxvt_wcstoutf8 (ws); 919 char *s = rxvt_wcstoutf8 (ws);
1016 920
1017 XChangeProperty (display->display, parent[0], 921 XChangeProperty (dpy, parent[0],
1018 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 922 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1019 (const unsigned char *)s, strlen (s)); 923 (const unsigned char *)s, strlen (s));
1020 924
1021 free (s); 925 free (s);
1022 free (ws); 926 free (ws);
… …
1041#if ENABLE_EWMH 945#if ENABLE_EWMH
1042 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
1043#endif 947#endif
1044} 948}
1045 949
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
1046#ifdef XTERM_COLOR_CHANGE 953#ifdef XTERM_COLOR_CHANGE
1047void
1048rxvt_term::set_window_color (int idx, const char *color)
1049{
1050 rxvt_color xcol; 954 rxvt_color xcol;
1051 int i; 955 int i;
1052 956
1053 if (color == NULL || *color == '\0') 957 if (color == NULL || *color == '\0')
1054 return; 958 return;
959
960 color = strdup (color);
961 allocated.push_back ((void *)color);
962 rs[Rs_color + idx] = color;
1055 963
1056 /* handle color aliases */ 964 /* handle color aliases */
1057 if (isdigit (*color)) 965 if (isdigit (*color))
1058 { 966 {
1059 i = atoi (color); 967 i = atoi (color);
1060 968
1061 if (i >= 8 && i <= 15) 969 if (i >= 8 && i <= 15)
1062 { /* bright colors */ 970 { /* bright colors */
1063 i -= 8; 971 i -= 8;
1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 972 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1065 SET_PIXCOLOR (idx);
1066 goto done; 973 goto done;
1067 } 974 }
1068 975
1069 if (i >= 0 && i <= 7) 976 if (i >= 0 && i <= 7)
1070 { /* normal colors */ 977 { /* normal colors */
1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 978 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1072 SET_PIXCOLOR (idx);
1073 goto done; 979 goto done;
1074 } 980 }
1075 } 981 }
1076 982
1077 if (!rXParseAllocColor (&xcol, color)) 983 set_color (xcol, color);
1078 return;
1079
1080 /* XStoreColor (display->display, display->cmap, XColor*); */
1081 984
1082 /* 985 /*
1083 * FIXME: should free colors here, but no idea how to do it so instead, 986 * FIXME: should free colors here, but no idea how to do it so instead,
1084 * so just keep gobbling up the colormap 987 * so just keep gobbling up the colormap
1085 */ 988 */
1086# if 0
1087 for (i = Color_Black; i <= Color_White; i++)
1088 if (pix_colors[idx] == pix_colors[i])
1089 break;
1090 if (i > Color_White)
1091 {
1092 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1093 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1094 DisplayPlanes (display->display, display->screen));
1095 }
1096# endif
1097 989
1098 pix_colors_focused[idx] = xcol; 990 pix_colors_focused[idx] = xcol;
1099 SET_PIXCOLOR (idx);
1100 991
1101 /* XSetWindowAttributes attr; */ 992 /* XSetWindowAttributes attr; */
1102 /* Cursor cursor; */ 993 /* Cursor cursor; */
1103done: 994done:
1104
1105#if OFF_FOCUS_FADING
1106 if (rs[Rs_fade])
1107 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1108#endif
1109
1110 /*TODO: handle Color_BD, scrollbar background, etc. */ 995 /*TODO: handle Color_BD, scrollbar background, etc. */
1111 996
997 update_fade_color (idx);
1112 recolour_cursor (); 998 recolour_cursor ();
1113 scr_recolour (); 999 scr_recolour ();
1114}
1115
1116#else
1117# define set_window_color (idx,color) ((void)0)
1118#endif /* XTERM_COLOR_CHANGE */ 1000#endif /* XTERM_COLOR_CHANGE */
1001}
1119 1002
1120void 1003void
1121rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
1122{ 1005{
1123 XColor xcol[2]; 1006 XColor fg, bg;
1124 1007
1125 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
1126 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
1127 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
1128 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
1129 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
1130 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
1131 1015
1132 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1133 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1134} 1017}
1135 1018
1136/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
1137/* 1020/*
1138 * 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
… …
1142{ 1025{
1143 unsigned int i; 1026 unsigned int i;
1144 const char *xpmb = "\0"; 1027 const char *xpmb = "\0";
1145 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1146 1029
1147 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1148 strcpy (fstr, "default"); 1030 strcpy (fstr, "default");
1149 strcpy (bstr, "default"); 1031 strcpy (bstr, "default");
1150 for (i = Color_Black; i <= Color_White; i++) 1032 for (i = Color_Black; i <= Color_White; i++)
1151 if (pix_colors[Color_fg] == pix_colors[i]) 1033 if (pix_colors[Color_fg] == pix_colors[i])
1152 { 1034 {
… …
1156 1038
1157 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
1158 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
1159 { 1041 {
1160 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1161#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1162 xpmb = "default;"; 1044 xpmb = "default;";
1163#endif 1045#endif
1164 break; 1046 break;
1165 } 1047 }
1166 1048
1167 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1168} 1050}
1169 1051
1170/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1171 1053
1172int 1054bool
1173rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1174{ 1056{
1175 if (!screen_in_out->set (display, colour)) 1057 if (color.set (this, name))
1176 {
1177 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1178 return false;
1179 }
1180
1181 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]);
1182} 1068}
1183 1069
1184/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1185 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1186 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
1187void 1073void
1188rxvt_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)
1189{ 1075{
1190 int fix_screen; 1076 int fix_screen;
1191 int old_width = szHint.width, old_height = szHint.height; 1077 int old_width = szHint.width;
1192 dDisp; 1078 int old_height = szHint.height;
1193 1079
1194 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)))
1195 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1196 1084
1197 if (!ignoreparent) 1085 if (!ignoreparent)
1198 { 1086 {
1199#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1200 /* 1088 /*
… …
1204 int x, y, x1, y1; 1092 int x, y, x1, y1;
1205 int dx, dy; 1093 int dx, dy;
1206 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1207 Window unused_cr; 1095 Window unused_cr;
1208 1096
1209 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1210 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1211 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1212 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1213 /* 1101 /*
1214 * 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
1215 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1216 */ 1104 */
… …
1218 { 1106 {
1219 x -= x1; 1107 x -= x1;
1220 y -= y1; 1108 y -= y1;
1221 } 1109 }
1222 1110
1223 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1224 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1225 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1226 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1227 1115
1228 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1229 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
1230 dx = 0; 1118 dx = 0;
… …
1233 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1234 dy = 0; 1122 dy = 0;
1235 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1236 dy /= 2; 1124 dy /= 2;
1237 1125
1238 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1239 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1240#else 1128#else
1241 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1242#endif 1130#endif
1243 } 1131 }
1244 1132
1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1246 1134
1247 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1248 { 1136 {
1249 if (scrollbar_visible ()) 1137 if (scrollBar.state)
1250 { 1138 {
1251 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1252 window_sb_x, 0, 1140 window_sb_x, 0,
1253 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1254 resize_scrollbar (); 1142 resize_scrollbar ();
1255 } 1143 }
1256 1144
1257 if (menubar_visible ())
1258 XMoveResizeWindow (disp, menuBar.win,
1259 window_vt_x, 0,
1260 width, menuBar_TotalHeight ());
1261
1262 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1263 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1264 width, height); 1147 width, height);
1265 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1266 scr_clear (); 1154 scr_clear ();
1267#ifdef XPM_BACKGROUND
1268 resize_pixmap ();
1269#endif
1270 } 1155 }
1271 1156
1272 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1273 {
1274 int curr_screen = -1;
1275 int old_ncol = prev_ncol;
1276
1277 /* scr_reset only works on the primary screen */
1278 if (old_height) /* this is not the first time through */
1279 {
1280 unsigned int ocol = ncol;
1281 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1282 curr_screen = scr_change_screen (PRIMARY);
1283 ncol = ocol;
1284 }
1285
1286 scr_reset (); 1158 scr_reset ();
1287 1159
1288 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
1289 { 1161 //scr_touch (false);
1290 scr_change_screen (curr_screen);
1291 selection_check (old_ncol != ncol ? 4 : 0);
1292 }
1293 }
1294 1162
1295 old_width = szHint.width; 1163#ifdef HAVE_BG_PIXMAP
1296 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 ?
1297 1165// if (bgPixmap.pixmap)
1298#ifdef XPM_BACKGROUND
1299 if (pixmap)
1300 scr_touch (false); 1166// scr_touch (false);
1301#endif 1167#endif
1302 1168
1303#ifdef USE_XIM 1169#ifdef USE_XIM
1304 IMSetStatusPosition (); 1170 IMSetPosition ();
1305#endif 1171#endif
1306} 1172}
1307 1173
1308/* 1174/*
1309 * 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.
… …
1314{ 1180{
1315 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1316 1182
1317 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1318 { 1184 {
1319 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1320 1186
1321 if (newwidth == 0) 1187 if (newwidth == 0)
1322 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1323 if (newheight == 0) 1189 if (newheight == 0)
1324 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
… …
1338#ifdef USE_XIM 1204#ifdef USE_XIM
1339 1205
1340void 1206void
1341rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1342{ 1208{
1343 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1344 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1345} 1211}
1346 1212
1347void 1213void
1348rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1349{ 1215{
… …
1386 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1387 1253
1388 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1389 *p = '\0'; 1255 *p = '\0';
1390 1256
1391 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1392 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1393 1259
1394 if (win != None) 1260 if (win != None)
1395 return True; 1261 return True;
1396 } 1262 }
1397 1263
… …
1404 XPoint nspot; 1270 XPoint nspot;
1405 XVaNestedList preedit_attr; 1271 XVaNestedList preedit_attr;
1406 1272
1407 if (!Input_Context 1273 if (!Input_Context
1408 || !focus 1274 || !focus
1409 || !(input_style & XIMPreeditPosition)) 1275 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1410 return; 1276 return;
1411 1277
1412 im_set_position (nspot); 1278 im_set_position (nspot);
1413 1279
1414 if (nspot.x == spot.x && nspot.y == spot.y) 1280 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1433 input_method = 0; 1299 input_method = 0;
1434 } 1300 }
1435 1301
1436 Input_Context = 0; 1302 Input_Context = 0;
1437} 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
1438 1378
1439/* 1379/*
1440 * 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
1441 * open a suitable preedit type 1381 * open a suitable preedit type
1442 */ 1382 */
… …
1449 XRectangle rect, status_rect, needed_rect; 1389 XRectangle rect, status_rect, needed_rect;
1450 unsigned long fg, bg; 1390 unsigned long fg, bg;
1451 const char *p; 1391 const char *p;
1452 char **s; 1392 char **s;
1453 XIMStyles *xim_styles; 1393 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1454 1397
1455 set_environ (envv); 1398 set_environ (envv);
1456 1399
1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1458 return false; 1401 return false;
1459 1402
1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1461 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1462 if (input_method == NULL) 1404 if (input_method == NULL)
1463 return false; 1405 return false;
1464 1406
1465 xim = input_method->xim; 1407 xim = input_method->xim;
… …
1485 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1486 1428
1487 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1488 { 1430 {
1489 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1490 input_style = (XIMPreeditPosition | XIMStatusNothing); 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
1491 else if (!strcmp (s[i], "OffTheSpot")) 1433 else if (!strcmp (s[i], "OffTheSpot"))
1492 input_style = (XIMPreeditArea | XIMStatusArea); 1434 input_style = XIMPreeditArea | XIMStatusArea;
1493 else if (!strcmp (s[i], "Root")) 1435 else if (!strcmp (s[i], "Root"))
1494 input_style = (XIMPreeditNothing | XIMStatusNothing); 1436 input_style = XIMPreeditNothing | XIMStatusNothing;
1495 else if (!strcmp (s[i], "None")) 1437 else if (!strcmp (s[i], "None"))
1496 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;
1497 1445
1498 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1499 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1500 { 1448 {
1501 rxvt_freecommastring (s); 1449 rxvt_freecommastring (s);
… …
1539 "*", 1487 "*",
1540 fheight, 1488 fheight,
1541 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1542 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1543 1491
1544 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1545 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1546 1494
1547 if (missing_charset_list) 1495 if (missing_charset_list)
1548 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1549 1497
… …
1590 XNBackground, bg, 1538 XNBackground, bg,
1591 XNArea, &status_rect, 1539 XNArea, &status_rect,
1592 XNFontSet, fs, 1540 XNFontSet, fs,
1593 NULL); 1541 NULL);
1594 } 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
1595 1566
1596 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1597 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1598 XNClientWindow, vt, 1569 XNClientWindow, vt,
1599 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
… …
1601 preedit_attr, 1572 preedit_attr,
1602 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1603 status_attr, NULL); 1574 status_attr, NULL);
1604 1575
1605 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1606 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1607 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1608 1579
1609 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1610 { 1581 {
1611 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1612 im_destroy (); 1583 im_destroy ();
1613 return false; 1584 return false;
1614 } 1585 }
1615 1586
1616 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
1617 IMSetStatusPosition (); 1593 IMSetPosition ();
1618 1594
1619 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1620 return true; 1595 return true;
1621} 1596}
1622 1597
1623void 1598void
1624rxvt_term::im_cb () 1599rxvt_term::im_cb ()
… …
1630 1605
1631 make_current (); 1606 make_current ();
1632 1607
1633 im_destroy (); 1608 im_destroy ();
1634 1609
1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1636 if (Input_Context) 1610 if (Input_Context)
1637 return; 1611 return;
1638 1612
1639#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1640 if (rs[Rs_imLocale]) 1614 if (rs[Rs_imLocale])
… …
1682 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1683#endif 1657#endif
1684} 1658}
1685 1659
1686void 1660void
1687rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1688{ 1662{
1689 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1690 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1691 1665
1692 if (!Input_Context 1666 if (!Input_Context
1693 || !focus 1667 || !focus
1694 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1695 || !IMisRunning ()) 1669 || !IMisRunning ())
1696 return; 1670 return;
1697 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 {
1698 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1699 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1700 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1701 XFree (status_attr); 1685 XFree (status_attr);
1702 1686
1703 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1704 XFree (needed_rect); 1688 XFree (needed_rect);
1705 1689
1706 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1707 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1708 1692
1709 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1710 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1711 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1712 1697
1698 XFree (status_attr);
1699 }
1700
1713 XFree (preedit_attr); 1701 XFree (preedit_attr);
1714 XFree (status_attr);
1715} 1702}
1716#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1717 1704
1718/*----------------------------------------------------------------------*/ 1705void
1719rxvt_t rxvt_current_term; 1706rxvt_term::get_window_origin (int &x, int &y)
1707{
1708 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711}
1712
1713Pixmap
1714rxvt_term::get_pixmap_property (int prop_id)
1715{
1716 if (prop_id > 0 && prop_id < NUM_XA)
1717 if (xa[prop_id])
1718 {
1719 int aformat;
1720 unsigned long nitems, bytes_after;
1721 Atom atype;
1722 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop;
1729 }
1730 }
1731 return None;
1732}
1733
1734#ifdef HAVE_BG_PIXMAP
1735int
1736rxvt_term::update_background ()
1737{
1738 bgPixmap.invalidate ();
1739
1740 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render ();
1743 else
1744 {
1745 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render ();
1760}
1761
1762#endif /* HAVE_BG_PIXMAP */
1720 1763
1721/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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