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.184 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.255 by ayin, Wed Oct 31 09:55:23 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
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 47#ifdef HAVE_XSETLOCALE
52static uid_t saved_euid; 48# define X_LOCALE
53static gid_t saved_egid; 49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
54#endif 53# endif
54#endif
55
56vector<rxvt_term *> rxvt_term::termlist;
57
58// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term;
60
61static char curlocale[128], savelocale[128];
55 62
56bool 63bool
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) 64rxvt_set_locale (const char *locale) NOTHROW
72{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
73 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 72 return false;
75 73
76 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
78 return true; 76 return true;
79} 77}
80 78
81void 79void
82rxvt_push_locale (const char *locale) 80rxvt_push_locale (const char *locale) NOTHROW
83{ 81{
84 strcpy (savelocale, curlocale); 82 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 83 rxvt_set_locale (locale);
86} 84}
87 85
88void 86void
89rxvt_pop_locale () 87rxvt_pop_locale () NOTHROW
90{ 88{
91 rxvt_set_locale (savelocale); 89 rxvt_set_locale (savelocale);
92} 90}
93 91
94#if ENABLE_COMBINING 92#if ENABLE_COMBINING
95class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
96 94
97text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
98{ 96{
99 compose_char *cc; 97 compose_char *cc;
100 98
101 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
102 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
103 cc = (*this)[c1]; 101 cc = (*this)[c1];
104 while (cc) 102 while (cc)
105 { 103 {
… …
155} 153}
156#endif 154#endif
157 155
158rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
159 : 157 :
160#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
161 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),
162#endif 163#endif
163#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 166#endif
166#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 184#endif
184#ifdef USE_XIM 185#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
186#endif 187#endif
188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb),
190#endif
187 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
193 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 194 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
… …
196 201
197 termlist.push_back (this); 202 termlist.push_back (this);
198 203
199#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 205 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 206#endif
205} 207}
206 208
207// 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.
208// for use before an emergency exit 210// for use before an emergency exit
211void
209void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
210{ 213{
211 if (cmd_pid) 214 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
213 216
214#ifdef UTMP_SUPPORT 217 pty_ev.stop ();
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 218 delete pty; pty = 0;
219} 219}
220 220
221rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
222{ 222{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 223 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 224
227 emergency_cleanup (); 225 emergency_cleanup ();
228 226
229#if ENABLE_STYLES 227#if ENABLE_STYLES
… …
233#endif 231#endif
234 delete fontset[0]; 232 delete fontset[0];
235 233
236 if (display) 234 if (display)
237 { 235 {
238 dDisp;
239
240 selection_clear (); 236 selection_clear ();
241 237
242#ifdef USE_XIM 238#ifdef USE_XIM
243 im_destroy (); 239 im_destroy ();
244#endif 240#endif
245#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 244#endif
249#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 247#endif
252#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 259#endif
264#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 264#endif
269 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (dpy, gc);
270 266
271 delete drawable; 267 delete drawable;
272 // destroy all windows 268 // destroy all windows
273 if (parent[0]) 269 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
275 }
276 271
277 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
278 delete pix_colors_focused; 273 if (ISSET_PIXCOLOR (i))
274 {
275 pix_colors_focused [i].free (this);
279#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
280 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
281#endif 287#endif
282 288
283 displays.put (display); 289 displays.put (display);
284 290
285 scr_release (); 291 scr_release ();
… …
288 for (int i = 0; i < allocated.size (); i++) 294 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 295 free (allocated [i]);
290 296
291 free (selection.text); 297 free (selection.text);
292 // TODO: manage env vars in child only(!) 298 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 299 free (env_display);
295 free (env_term); 300 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 301 free (locale);
298 free (v_buffer); 302 free (v_buffer);
299 free (incr_buf); 303 free (incr_buf);
300 304
301 delete envv; 305 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 308#ifdef KEYSYM_RESOURCE
305 delete keyboard; 309 delete keyboard;
306#endif 310#endif
307} 311}
308 312
313// child has exited, usually destroys
309void 314void
310rxvt_term::child_exit () 315rxvt_term::child_cb (child_watcher &w, int status)
311{ 316{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318
312 cmd_pid = 0; 319 cmd_pid = 0;
313 320
314 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
315 destroy (); 322 destroy ();
316} 323}
317 324
318void 325void
319rxvt_term::destroy () 326rxvt_term::destroy ()
320{ 327{
321 if (destroy_ev.active) 328 if (destroy_ev.active)
322 return; 329 return;
323 330
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332
324#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
325 scr_overlay_off (); 334 scr_overlay_off ();
326#endif 335#endif
327 336
328 if (display) 337 if (display)
… …
331 im_ev.stop (display); 340 im_ev.stop (display);
332#endif 341#endif
333#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
335#endif 344#endif
336#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
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);
… …
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];
… …
425 else 434 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 436 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 438 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 440 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 442}
434#endif 443#endif
435 444
… …
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 set_locale (""); 480 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 481 set_environ (envv); // few things in X do not call setlocale :(
471 482
472 if (!init_vars ()) 483 if (!init_vars ())
… …
479#ifdef KEYSYM_RESOURCE 490#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 491 keyboard->register_done ();
481#endif 492#endif
482 493
483#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 495 if (option (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 497#endif
487 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
488#if ENABLE_PERL 559#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
514 pty = rxvt_new_ptytty ();
515
516 create_windows (argc, argv);
517
518 dDisp;
519
520 init_xlocale ();
521
522 scr_reset (); // initialize screen
523
524#if 0
525 XSynchronize (disp, True);
526#endif
527
528#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */
531#endif
532#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent))
534 {
535 XSelectInput (disp, display->root, PropertyChangeMask);
536 check_our_parents ();
537 rootwin_ev.start (display, display->root); 560 rootwin_ev.start (display, display->root);
538 }
539#endif 561#endif
540
541 XMapWindow (disp, vt);
542 XMapWindow (disp, parent[0]);
543 562
544 set_colorfgbg (); 563 set_colorfgbg ();
545 564
546 init_command (cmd_argv); 565 init_command (cmd_argv);
547 566
… …
552 571
553 check_ev.start (); 572 check_ev.start ();
554 573
555 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
556 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
557 return true; 589 return true;
558} 590}
559 591
560static struct sig_handlers 592static struct sig_handlers
561{ 593{
562 sig_watcher sw_chld, sw_term, sw_int; 594 sig_watcher sw_term, sw_int;
563
564 void sig_chld (sig_watcher &w)
565 {
566 // we are being called for every SIGCHLD, find the corresponding term
567 int pid;
568
569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571 if (pid == (*t)->cmd_pid)
572 {
573 (*t)->child_exit ();
574 break;
575 }
576 }
577 595
578 /* 596 /*
579 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
580 */ 598 */
581 void 599 void
582 sig_term (sig_watcher &w) 600 sig_term (sig_watcher &w)
583 { 601 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL); 603 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
590 } 605 }
591 606
592 sig_handlers () 607 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term) 609 sw_int (this, &sig_handlers::sig_term)
596 { 610 {
597 } 611 }
598} sig_handlers; 612} sig_handlers;
599 613
600char **rxvt_environ; // startup environment 614char **rxvt_environ; // startup environment
601 615
602void 616void
603rxvt_init () 617rxvt_init ()
604{ 618{
619 ptytty::init ();
620
605 rxvt_environ = environ; 621 rxvt_environ = environ;
606
607 /*
608 * Save and then give up any super-user privileges
609 * If we need privileges in any area then we must specifically request it.
610 * We should only need to be root in these cases:
611 * 1. write utmp entries on some systems
612 * 2. chown tty on some systems
613 */
614 rxvt_privileges (SAVE);
615 rxvt_privileges (IGNORE);
616 622
617 signal (SIGHUP, SIG_IGN); 623 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 624 signal (SIGPIPE, SIG_IGN);
619 625
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 626 sig_handlers.sw_term.start (SIGTERM);
622 sig_handlers.sw_int.start (SIGINT); 627 sig_handlers.sw_int.start (SIGINT);
623 628
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 629 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 630 /* signal (SIGURG, SIG_DFL); */
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 659 rxvt_fatal ("memory allocation failure. aborting.\n");
655 660
656 return p; 661 return p;
657} 662}
658 663
659void * 664void *
660rxvt_realloc (void *ptr, size_t size) 665rxvt_realloc (void *ptr, size_t size)
661{ 666{
662 void *p = realloc (ptr, size); 667 void *p = realloc (ptr, size);
663 668
664 if (!p) 669 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 670 rxvt_fatal ("memory allocation failure. aborting.\n");
666 671
667 return p; 672 return p;
668} 673}
669 674
670/* ------------------------------------------------------------------------- *
671 * PRIVILEGED OPERATIONS *
672 * ------------------------------------------------------------------------- */
673/* take care of suid/sgid super-user (root) privileges */
674void
675rxvt_privileges (rxvt_privaction action)
676{
677#if ! defined(__CYGWIN32__)
678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679 /* setreuid () is the poor man's setuid (), seteuid () */
680# define seteuid(a) setreuid(-1, (a))
681# define setegid(a) setregid(-1, (a))
682# define HAVE_SETEUID
683# endif
684# ifdef HAVE_SETEUID
685 switch (action)
686 {
687 case IGNORE:
688 /*
689 * change effective uid/gid - not real uid/gid - so we can switch
690 * back to root later, as required
691 */
692 setegid (getgid ());
693 seteuid (getuid ());
694 break;
695 case SAVE:
696 saved_egid = getegid ();
697 saved_euid = geteuid ();
698 break;
699 case RESTORE:
700 setegid (saved_egid);
701 seteuid (saved_euid);
702 break;
703 }
704# else
705 switch (action)
706 {
707 case IGNORE:
708 setgid (getgid ());
709 setuid (getuid ());
710 /* FALLTHROUGH */
711 case SAVE:
712 /* FALLTHROUGH */
713 case RESTORE:
714 break;
715 }
716# endif
717#endif
718}
719
720#ifdef UTMP_SUPPORT
721void
722rxvt_term::privileged_utmp (rxvt_privaction action)
723{
724 if (OPTION (Opt_utmpInhibit))
725 return;
726
727 rxvt_privileges (RESTORE);
728
729 if (action == SAVE)
730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
731 else
732 pty->logout ();
733
734 rxvt_privileges (IGNORE);
735}
736#endif
737
738/*----------------------------------------------------------------------*/ 675/*----------------------------------------------------------------------*/
739/* 676/*
740 * window size/position calculcations for XSizeHint and other storage. 677 * window size/position calculations for XSizeHint and other storage.
741 * if width/height are non-zero then override calculated width/height 678 * if width/height are non-zero then override calculated width/height
742 */ 679 */
743void 680void
744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 681rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
745{ 682{
746 short recalc_x, recalc_y; 683 short recalc_x, recalc_y;
747 int x, y, sb_w, flags; 684 int x, y, sb_w, flags;
748 unsigned int w, h; 685 unsigned int w, h;
749 unsigned int max_width, max_height; 686 unsigned int max_width, max_height;
750 dDisp;
751
752 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
753 ncol, nrow, szHint.width, szHint.height));
754 687
755 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 688 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
756 szHint.win_gravity = NorthWestGravity; 689 szHint.win_gravity = NorthWestGravity;
757 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 690 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
758 691
… …
820 753
821 if (scrollBar.state) 754 if (scrollBar.state)
822 { 755 {
823 sb_w = scrollbar_TotalWidth (); 756 sb_w = scrollbar_TotalWidth ();
824 szHint.base_width += sb_w; 757 szHint.base_width += sb_w;
758
825 if (!OPTION (Opt_scrollBar_right)) 759 if (!option (Opt_scrollBar_right))
826 window_vt_x += sb_w; 760 window_vt_x += sb_w;
827 } 761 }
828 762
829 szHint.width_inc = fwidth; 763 szHint.width_inc = fwidth;
830 szHint.height_inc = fheight; 764 szHint.height_inc = fheight;
831 szHint.min_width = szHint.base_width + szHint.width_inc; 765 szHint.min_width = szHint.base_width + szHint.width_inc;
832 szHint.min_height = szHint.base_height + szHint.height_inc; 766 szHint.min_height = szHint.base_height + szHint.height_inc;
833 767
834 if (newwidth && newwidth - szHint.base_width < max_width) 768 if (newwidth && newwidth - szHint.base_width < max_width)
835 { 769 {
836 szHint.width = newwidth; 770 szHint.width = newwidth;
… …
851 { 785 {
852 min_it (height, max_height); 786 min_it (height, max_height);
853 szHint.height = szHint.base_height + height; 787 szHint.height = szHint.base_height + height;
854 } 788 }
855 789
856 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 790 if (scrollBar.state && option (Opt_scrollBar_right))
857 window_sb_x = szHint.width - sb_w; 791 window_sb_x = szHint.width - sb_w;
858 792
859 if (recalc_x) 793 if (recalc_x)
860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 794 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
795
861 if (recalc_y) 796 if (recalc_y)
862 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 797 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
863 798
864 ncol = width / fwidth; 799 ncol = width / fwidth;
865 nrow = height / fheight; 800 nrow = height / fheight;
866 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
867 ncol, nrow, szHint.width,
868 szHint.height));
869 return;
870} 801}
871 802
872/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
873/* 804/*
874 * Tell the teletype handler what size the window is. 805 * Tell the teletype handler what size the window is.
… …
926 delete fontset[0]; 857 delete fontset[0];
927 fontset[0] = fs; 858 fontset[0] = fs;
928 859
929 prop = (*fs)[1]->properties (); 860 prop = (*fs)[1]->properties ();
930 prop.height += lineSpace; 861 prop.height += lineSpace;
862
931 fs->set_prop (prop); 863 fs->set_prop (prop, false);
932 864
933 fwidth = prop.width; 865 fwidth = prop.width;
934 fheight = prop.height; 866 fheight = prop.height;
935 fbase = prop.ascent; 867 fbase = prop.ascent;
936 868
… …
945 { 877 {
946 fontset[style] = fs = new rxvt_fontset (this); 878 fontset[style] = fs = new rxvt_fontset (this);
947 rxvt_fontprop prop2 = prop; 879 rxvt_fontprop prop2 = prop;
948 880
949 if (res) 881 if (res)
950 prop2.weight = prop2.slant = rxvt_fontprop::unset; 882 {
883 fs->populate (res);
884 fs->set_prop (prop2, false);
885 }
951 else 886 else
952 { 887 {
953 res = fontset[0]->fontdesc; 888 fs->populate (fontset[0]->fontdesc);
954 889
955 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;
956 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);
957 } 894 }
958 895
959 fs->populate (res);
960 fs->set_prop (prop2);
961 } 896 }
962#else 897#else
963 fontset[style] = fontset[0]; 898 fontset[style] = fontset[0];
964#endif 899#endif
965 } 900 }
… …
967 if (parent[0]) 902 if (parent[0])
968 { 903 {
969 resize_all_windows (0, 0, 0); 904 resize_all_windows (0, 0, 0);
970 scr_remap_chars (); 905 scr_remap_chars ();
971 scr_touch (true); 906 scr_touch (true);
972 } 907 }
973 908
974 return true; 909 return true;
975} 910}
976 911
912void
977void rxvt_term::set_string_property (Atom prop, const char *str, int len) 913rxvt_term::set_string_property (Atom prop, const char *str, int len)
978{ 914{
979 XChangeProperty (display->display, parent[0], 915 XChangeProperty (dpy, parent[0],
980 prop, XA_STRING, 8, PropModeReplace, 916 prop, XA_STRING, 8, PropModeReplace,
981 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 917 (const unsigned char *)str, len >= 0 ? len : strlen (str));
982} 918}
983 919
920void
984void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 921rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
985{ 922{
986 wchar_t *ws = rxvt_mbstowcs (str, len); 923 wchar_t *ws = rxvt_mbstowcs (str, len);
987 char *s = rxvt_wcstoutf8 (ws); 924 char *s = rxvt_wcstoutf8 (ws);
988 925
989 XChangeProperty (display->display, parent[0], 926 XChangeProperty (dpy, parent[0],
990 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 927 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
991 (const unsigned char *)s, strlen (s)); 928 (const unsigned char *)s, strlen (s));
992 929
993 free (s); 930 free (s);
994 free (ws); 931 free (ws);
… …
1013#if ENABLE_EWMH 950#if ENABLE_EWMH
1014 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 951 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
1015#endif 952#endif
1016} 953}
1017 954
955void
956rxvt_term::set_window_color (int idx, const char *color)
957{
1018#ifdef XTERM_COLOR_CHANGE 958#ifdef XTERM_COLOR_CHANGE
1019void
1020rxvt_term::set_window_color (int idx, const char *color)
1021{
1022 rxvt_color xcol; 959 rxvt_color xcol;
1023 int i; 960 int i;
1024 961
1025 if (color == NULL || *color == '\0') 962 if (color == NULL || *color == '\0')
1026 return; 963 return;
964
965 color = strdup (color);
966 allocated.push_back ((void *)color);
967 rs[Rs_color + idx] = color;
1027 968
1028 /* handle color aliases */ 969 /* handle color aliases */
1029 if (isdigit (*color)) 970 if (isdigit (*color))
1030 { 971 {
1031 i = atoi (color); 972 i = atoi (color);
1032 973
1033 if (i >= 8 && i <= 15) 974 if (i >= 8 && i <= 15)
1034 { /* bright colors */ 975 { /* bright colors */
1035 i -= 8; 976 i -= 8;
1036 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 977 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1037 SET_PIXCOLOR (idx);
1038 goto done; 978 goto done;
1039 } 979 }
1040 980
1041 if (i >= 0 && i <= 7) 981 if (i >= 0 && i <= 7)
1042 { /* normal colors */ 982 { /* normal colors */
1043 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 983 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1044 SET_PIXCOLOR (idx);
1045 goto done; 984 goto done;
1046 } 985 }
1047 } 986 }
1048 987
1049 if (!rXParseAllocColor (&xcol, color)) 988 set_color (xcol, color);
1050 return;
1051
1052 /* XStoreColor (display->display, display->cmap, XColor*); */
1053 989
1054 /* 990 /*
1055 * 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,
1056 * so just keep gobbling up the colormap 992 * so just keep gobbling up the colormap
1057 */ 993 */
1058# if 0
1059 for (i = Color_Black; i <= Color_White; i++)
1060 if (pix_colors[idx] == pix_colors[i])
1061 break;
1062 if (i > Color_White)
1063 {
1064 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1065 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1066 DisplayPlanes (display->display, display->screen));
1067 }
1068# endif
1069 994
1070 pix_colors_focused[idx] = xcol; 995 pix_colors_focused[idx] = xcol;
1071 SET_PIXCOLOR (idx);
1072 996
1073 /* XSetWindowAttributes attr; */ 997 /* XSetWindowAttributes attr; */
1074 /* Cursor cursor; */ 998 /* Cursor cursor; */
1075done: 999done:
1076
1077#if OFF_FOCUS_FADING
1078 if (rs[Rs_fade])
1079 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1080#endif
1081
1082 /*TODO: handle Color_BD, scrollbar background, etc. */ 1000 /*TODO: handle Color_BD, scrollbar background, etc. */
1083 1001
1002 update_fade_color (idx);
1084 recolour_cursor (); 1003 recolour_cursor ();
1085 scr_recolour (); 1004 scr_recolour ();
1086}
1087
1088#else
1089# define set_window_color (idx,color) ((void)0)
1090#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
1006}
1091 1007
1092void 1008void
1093rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
1094{ 1010{
1095 XColor xcol[2]; 1011 XColor fg, bg;
1096 1012
1097 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
1098 ? pix_colors_focused[Color_pointer_fg] 1014 ? pix_colors_focused[Color_pointer_fg]
1099 : pix_colors_focused[Color_fg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
1016
1100 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
1101 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
1102 : pix_colors_focused[Color_bg]; 1019 : pix_colors_focused[Color_bg]).get (bg);
1103 1020
1104 XQueryColors (display->display, display->cmap, xcol, 2); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1105 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1106} 1022}
1107 1023
1108/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
1109/* 1025/*
1110 * 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
… …
1114{ 1030{
1115 unsigned int i; 1031 unsigned int i;
1116 const char *xpmb = "\0"; 1032 const char *xpmb = "\0";
1117 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1118 1034
1119 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1120 strcpy (fstr, "default"); 1035 strcpy (fstr, "default");
1121 strcpy (bstr, "default"); 1036 strcpy (bstr, "default");
1122 for (i = Color_Black; i <= Color_White; i++) 1037 for (i = Color_Black; i <= Color_White; i++)
1123 if (pix_colors[Color_fg] == pix_colors[i]) 1038 if (pix_colors[Color_fg] == pix_colors[i])
1124 { 1039 {
… …
1128 1043
1129 for (i = Color_Black; i <= Color_White; i++) 1044 for (i = Color_Black; i <= Color_White; i++)
1130 if (pix_colors[Color_bg] == pix_colors[i]) 1045 if (pix_colors[Color_bg] == pix_colors[i])
1131 { 1046 {
1132 sprintf (bstr, "%d", (i - Color_Black)); 1047 sprintf (bstr, "%d", (i - Color_Black));
1133#ifdef XPM_BACKGROUND 1048#ifdef BG_IMAGE_FROM_FILE
1134 xpmb = "default;"; 1049 xpmb = "default;";
1135#endif 1050#endif
1136 break; 1051 break;
1137 } 1052 }
1138 1053
1139 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1140} 1055}
1141 1056
1142/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
1143 1058
1144int 1059bool
1145rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1060rxvt_term::set_color (rxvt_color &color, const char *name)
1146{ 1061{
1147 if (!screen_in_out->set (display, colour)) 1062 if (color.set (this, name))
1148 {
1149 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1150 return false;
1151 }
1152
1153 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]);
1154} 1073}
1155 1074
1156/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
1157 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
1158 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
1159void 1078void
1160rxvt_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)
1161{ 1080{
1162 int fix_screen; 1081 int fix_screen;
1163 int old_width = szHint.width, old_height = szHint.height; 1082 int old_width = szHint.width;
1164 dDisp; 1083 int old_height = szHint.height;
1165 1084
1166 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)))
1167 XSetWMNormalHints (disp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1168 1089
1169 if (!ignoreparent) 1090 if (!ignoreparent)
1170 { 1091 {
1171#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1172 /* 1093 /*
… …
1176 int x, y, x1, y1; 1097 int x, y, x1, y1;
1177 int dx, dy; 1098 int dx, dy;
1178 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1179 Window unused_cr; 1100 Window unused_cr;
1180 1101
1181 XTranslateCoordinates (disp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1182 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1183 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1184 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1185 /* 1106 /*
1186 * 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
1187 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1188 */ 1109 */
… …
1190 { 1111 {
1191 x -= x1; 1112 x -= x1;
1192 y -= y1; 1113 y -= y1;
1193 } 1114 }
1194 1115
1195 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1196 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1197 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1198 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1199 1120
1200 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1201 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
1202 dx = 0; 1123 dx = 0;
… …
1205 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1206 dy = 0; 1127 dy = 0;
1207 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1208 dy /= 2; 1129 dy /= 2;
1209 1130
1210 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1211 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1212#else 1133#else
1213 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1214#endif 1135#endif
1215 } 1136 }
1216 1137
1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1218 1139
1219 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1220 { 1141 {
1221 if (scrollBar.state) 1142 if (scrollBar.state)
1222 { 1143 {
1223 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1224 window_sb_x, 0, 1145 window_sb_x, 0,
1225 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1226 resize_scrollbar (); 1147 resize_scrollbar ();
1227 } 1148 }
1228 1149
1229 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (dpy, vt,
1230 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1231 width, height); 1152 width, height);
1232 1153
1154#ifdef HAVE_BG_PIXMAP
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1233 scr_clear (); 1159 scr_clear ();
1234#ifdef XPM_BACKGROUND
1235 resize_pixmap ();
1236#endif
1237 } 1160 }
1238 1161
1239 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1240 {
1241 int curr_screen = -1;
1242 int old_ncol = prev_ncol;
1243
1244 /* scr_reset only works on the primary screen */
1245 if (old_height) /* this is not the first time through */
1246 {
1247 unsigned int ocol = ncol;
1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1249 curr_screen = scr_change_screen (PRIMARY);
1250 ncol = ocol;
1251 }
1252
1253 scr_reset (); 1163 scr_reset ();
1254 1164
1255 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
1256 { 1166 //scr_touch (false);
1257 scr_change_screen (curr_screen);
1258 selection_check (old_ncol != ncol ? 4 : 0);
1259 }
1260 }
1261 1167
1262 old_width = szHint.width; 1168#ifdef HAVE_BG_PIXMAP
1263 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 ?
1264 1170// if (bgPixmap.pixmap)
1265#ifdef XPM_BACKGROUND
1266 if (pixmap)
1267 scr_touch (false); 1171// scr_touch (false);
1268#endif 1172#endif
1269 1173
1270#ifdef USE_XIM 1174#ifdef USE_XIM
1271 IMSetStatusPosition (); 1175 IMSetPosition ();
1272#endif 1176#endif
1273} 1177}
1274 1178
1275/* 1179/*
1276 * 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.
… …
1281{ 1185{
1282 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1283 1187
1284 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1285 { 1189 {
1286 XGetWindowAttributes (display->display, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1287 1191
1288 if (newwidth == 0) 1192 if (newwidth == 0)
1289 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1290 if (newheight == 0) 1194 if (newheight == 0)
1291 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1305#ifdef USE_XIM 1209#ifdef USE_XIM
1306 1210
1307void 1211void
1308rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1212rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1309{ 1213{
1310 fg = pix_colors[Color_fg]; 1214 fg = pix_colors [Color_fg];
1311 bg = pix_colors[Color_bg]; 1215 bg = pix_colors [Color_bg];
1312} 1216}
1313 1217
1314void 1218void
1315rxvt_term::im_set_size (XRectangle &size) 1219rxvt_term::im_set_size (XRectangle &size)
1316{ 1220{
… …
1353 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1354 1258
1355 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1356 *p = '\0'; 1260 *p = '\0';
1357 1261
1358 atom = XInternAtom (display->display, server, False); 1262 atom = XInternAtom (dpy, server, False);
1359 win = XGetSelectionOwner (display->display, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1360 1264
1361 if (win != None) 1265 if (win != None)
1362 return True; 1266 return True;
1363 } 1267 }
1364 1268
… …
1371 XPoint nspot; 1275 XPoint nspot;
1372 XVaNestedList preedit_attr; 1276 XVaNestedList preedit_attr;
1373 1277
1374 if (!Input_Context 1278 if (!Input_Context
1375 || !focus 1279 || !focus
1376 || !(input_style & XIMPreeditPosition)) 1280 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1377 return; 1281 return;
1378 1282
1379 im_set_position (nspot); 1283 im_set_position (nspot);
1380 1284
1381 if (nspot.x == spot.x && nspot.y == spot.y) 1285 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1400 input_method = 0; 1304 input_method = 0;
1401 } 1305 }
1402 1306
1403 Input_Context = 0; 1307 Input_Context = 0;
1404} 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
1405 1383
1406/* 1384/*
1407 * 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
1408 * open a suitable preedit type 1386 * open a suitable preedit type
1409 */ 1387 */
… …
1416 XRectangle rect, status_rect, needed_rect; 1394 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1395 unsigned long fg, bg;
1418 const char *p; 1396 const char *p;
1419 char **s; 1397 char **s;
1420 XIMStyles *xim_styles; 1398 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1421 1402
1422 set_environ (envv); 1403 set_environ (envv);
1423 1404
1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425 return false; 1406 return false;
1426 1407
1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428 input_method = display->get_xim (locale, modifiers); 1408 input_method = display->get_xim (locale, modifiers);
1429 if (input_method == NULL) 1409 if (input_method == NULL)
1430 return false; 1410 return false;
1431 1411
1432 xim = input_method->xim; 1412 xim = input_method->xim;
… …
1452 s = rxvt_splitcommastring (p); 1432 s = rxvt_splitcommastring (p);
1453 1433
1454 for (i = found = 0; !found && s[i]; i++) 1434 for (i = found = 0; !found && s[i]; i++)
1455 { 1435 {
1456 if (!strcmp (s[i], "OverTheSpot")) 1436 if (!strcmp (s[i], "OverTheSpot"))
1457 input_style = (XIMPreeditPosition | XIMStatusNothing); 1437 input_style = XIMPreeditPosition | XIMStatusNothing;
1458 else if (!strcmp (s[i], "OffTheSpot")) 1438 else if (!strcmp (s[i], "OffTheSpot"))
1459 input_style = (XIMPreeditArea | XIMStatusArea); 1439 input_style = XIMPreeditArea | XIMStatusArea;
1460 else if (!strcmp (s[i], "Root")) 1440 else if (!strcmp (s[i], "Root"))
1461 input_style = (XIMPreeditNothing | XIMStatusNothing); 1441 input_style = XIMPreeditNothing | XIMStatusNothing;
1462 else if (!strcmp (s[i], "None")) 1442 else if (!strcmp (s[i], "None"))
1463 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;
1464 1450
1465 for (j = 0; j < xim_styles->count_styles; j++) 1451 for (j = 0; j < xim_styles->count_styles; j++)
1466 if (input_style == xim_styles->supported_styles[j]) 1452 if (input_style == xim_styles->supported_styles[j])
1467 { 1453 {
1468 rxvt_freecommastring (s); 1454 rxvt_freecommastring (s);
… …
1506 "*", 1492 "*",
1507 fheight, 1493 fheight,
1508 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1509 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1510 1496
1511 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1512 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1513 1499
1514 if (missing_charset_list) 1500 if (missing_charset_list)
1515 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1516 1502
… …
1557 XNBackground, bg, 1543 XNBackground, bg,
1558 XNArea, &status_rect, 1544 XNArea, &status_rect,
1559 XNFontSet, fs, 1545 XNFontSet, fs,
1560 NULL); 1546 NULL);
1561 } 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
1562 1571
1563 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1564 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1565 XNClientWindow, vt, 1574 XNClientWindow, vt,
1566 XNFocusWindow, parent[0], 1575 XNFocusWindow, parent[0],
… …
1568 preedit_attr, 1577 preedit_attr,
1569 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1570 status_attr, NULL); 1579 status_attr, NULL);
1571 1580
1572 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1573 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1574 if (fs) XFreeFontSet (display->display, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1575 1584
1576 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1577 { 1586 {
1578 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579 im_destroy (); 1588 im_destroy ();
1580 return false; 1589 return false;
1581 } 1590 }
1582 1591
1583 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
1584 IMSetStatusPosition (); 1598 IMSetPosition ();
1585 1599
1586 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587 return true; 1600 return true;
1588} 1601}
1589 1602
1590void 1603void
1591rxvt_term::im_cb () 1604rxvt_term::im_cb ()
… …
1597 1610
1598 make_current (); 1611 make_current ();
1599 1612
1600 im_destroy (); 1613 im_destroy ();
1601 1614
1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603 if (Input_Context) 1615 if (Input_Context)
1604 return; 1616 return;
1605 1617
1606#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1618#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1607 if (rs[Rs_imLocale]) 1619 if (rs[Rs_imLocale])
… …
1649 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1650#endif 1662#endif
1651} 1663}
1652 1664
1653void 1665void
1654rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1655{ 1667{
1656 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1657 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1658 1670
1659 if (!Input_Context 1671 if (!Input_Context
1660 || !focus 1672 || !focus
1661 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1662 || !IMisRunning ()) 1674 || !IMisRunning ())
1663 return; 1675 return;
1664 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 {
1665 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1666 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1667 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1668 XFree (status_attr); 1690 XFree (status_attr);
1669 1691
1670 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1671 XFree (needed_rect); 1693 XFree (needed_rect);
1672 1694
1673 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1674 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1675 1697
1676 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1677 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1678 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1679 1702
1703 XFree (status_attr);
1704 }
1705
1680 XFree (preedit_attr); 1706 XFree (preedit_attr);
1681 XFree (status_attr);
1682} 1707}
1683#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1684 1709
1685/*----------------------------------------------------------------------*/ 1710void
1686rxvt_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 */
1687 1768
1688/*----------------------- end-of-file (C source) -----------------------*/ 1769/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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