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

Diff Legend

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