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.185 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.256 by root, Sun Nov 11 04:08:00 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),
189 check_ev (this, &rxvt_term::check_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_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)
194{ 199{
… …
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 (ev::child &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);
342 } 351 }
343 352
344 check_ev.stop (); 353 prepare_ev.stop ();
345 pty_ev.stop (); 354 pty_ev.stop ();
346#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
348#endif 357#endif
349#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
357#endif 366#endif
358#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
359 pointer_ev.stop (); 368 pointer_ev.stop ();
360#endif 369#endif
361 370
362 destroy_ev.start (0); 371 destroy_ev.start ();
363} 372}
364 373
365void 374void
366rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::check &w, int revents)
367{ 376{
368 make_current (); 377 make_current ();
369 378
370 delete this; 379 delete this;
371} 380}
… …
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
548 free (cmd_argv); 567 free (cmd_argv);
549 568
550 if (pty->pty >= 0) 569 if (pty->pty >= 0)
551 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
552 571
553 check_ev.start (); 572 prepare_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 ev::sig 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 (ev::sig &w, int revents)
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 w.stop ();
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 ev::ev_default_loop (0);
621
605 rxvt_environ = environ; 622 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 623
617 signal (SIGHUP, SIG_IGN); 624 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 625 signal (SIGPIPE, SIG_IGN);
619 626
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 627 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 628 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
623 629
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 631 /* signal (SIGURG, SIG_DFL); */
626 632
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 660 rxvt_fatal ("memory allocation failure. aborting.\n");
655 661
656 return p; 662 return p;
657} 663}
658 664
659void * 665void *
660rxvt_realloc (void *ptr, size_t size) 666rxvt_realloc (void *ptr, size_t size)
661{ 667{
662 void *p = realloc (ptr, size); 668 void *p = realloc (ptr, size);
663 669
664 if (!p) 670 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 671 rxvt_fatal ("memory allocation failure. aborting.\n");
666 672
667 return p; 673 return p;
668} 674}
669 675
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/*----------------------------------------------------------------------*/ 676/*----------------------------------------------------------------------*/
721/* 677/*
722 * window size/position calculcations for XSizeHint and other storage. 678 * window size/position calculations for XSizeHint and other storage.
723 * if width/height are non-zero then override calculated width/height 679 * if width/height are non-zero then override calculated width/height
724 */ 680 */
725void 681void
726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 682rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
727{ 683{
728 short recalc_x, recalc_y; 684 short recalc_x, recalc_y;
729 int x, y, sb_w, flags; 685 int x, y, sb_w, flags;
730 unsigned int w, h; 686 unsigned int w, h;
731 unsigned int max_width, max_height; 687 unsigned int max_width, max_height;
732 dDisp;
733
734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
735 ncol, nrow, szHint.width, szHint.height));
736 688
737 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 689 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
738 szHint.win_gravity = NorthWestGravity; 690 szHint.win_gravity = NorthWestGravity;
739 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 691 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740 692
… …
802 754
803 if (scrollBar.state) 755 if (scrollBar.state)
804 { 756 {
805 sb_w = scrollbar_TotalWidth (); 757 sb_w = scrollbar_TotalWidth ();
806 szHint.base_width += sb_w; 758 szHint.base_width += sb_w;
759
807 if (!OPTION (Opt_scrollBar_right)) 760 if (!option (Opt_scrollBar_right))
808 window_vt_x += sb_w; 761 window_vt_x += sb_w;
809 } 762 }
810 763
811 szHint.width_inc = fwidth; 764 szHint.width_inc = fwidth;
812 szHint.height_inc = fheight; 765 szHint.height_inc = fheight;
813 szHint.min_width = szHint.base_width + szHint.width_inc; 766 szHint.min_width = szHint.base_width + szHint.width_inc;
814 szHint.min_height = szHint.base_height + szHint.height_inc; 767 szHint.min_height = szHint.base_height + szHint.height_inc;
815 768
816 if (newwidth && newwidth - szHint.base_width < max_width) 769 if (newwidth && newwidth - szHint.base_width < max_width)
817 { 770 {
818 szHint.width = newwidth; 771 szHint.width = newwidth;
… …
833 { 786 {
834 min_it (height, max_height); 787 min_it (height, max_height);
835 szHint.height = szHint.base_height + height; 788 szHint.height = szHint.base_height + height;
836 } 789 }
837 790
838 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 791 if (scrollBar.state && option (Opt_scrollBar_right))
839 window_sb_x = szHint.width - sb_w; 792 window_sb_x = szHint.width - sb_w;
840 793
841 if (recalc_x) 794 if (recalc_x)
842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 795 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
796
843 if (recalc_y) 797 if (recalc_y)
844 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 798 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
845 799
846 ncol = width / fwidth; 800 ncol = width / fwidth;
847 nrow = height / fheight; 801 nrow = height / fheight;
848 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
849 ncol, nrow, szHint.width,
850 szHint.height));
851 return;
852} 802}
853 803
854/*----------------------------------------------------------------------*/ 804/*----------------------------------------------------------------------*/
855/* 805/*
856 * Tell the teletype handler what size the window is. 806 * Tell the teletype handler what size the window is.
… …
908 delete fontset[0]; 858 delete fontset[0];
909 fontset[0] = fs; 859 fontset[0] = fs;
910 860
911 prop = (*fs)[1]->properties (); 861 prop = (*fs)[1]->properties ();
912 prop.height += lineSpace; 862 prop.height += lineSpace;
863
913 fs->set_prop (prop); 864 fs->set_prop (prop, false);
914 865
915 fwidth = prop.width; 866 fwidth = prop.width;
916 fheight = prop.height; 867 fheight = prop.height;
917 fbase = prop.ascent; 868 fbase = prop.ascent;
918 869
… …
927 { 878 {
928 fontset[style] = fs = new rxvt_fontset (this); 879 fontset[style] = fs = new rxvt_fontset (this);
929 rxvt_fontprop prop2 = prop; 880 rxvt_fontprop prop2 = prop;
930 881
931 if (res) 882 if (res)
932 prop2.weight = prop2.slant = rxvt_fontprop::unset; 883 {
884 fs->populate (res);
885 fs->set_prop (prop2, false);
886 }
933 else 887 else
934 { 888 {
935 res = fontset[0]->fontdesc; 889 fs->populate (fontset[0]->fontdesc);
936 890
937 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 891 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
938 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 892 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
893
894 fs->set_prop (prop2, true);
939 } 895 }
940 896
941 fs->populate (res);
942 fs->set_prop (prop2);
943 } 897 }
944#else 898#else
945 fontset[style] = fontset[0]; 899 fontset[style] = fontset[0];
946#endif 900#endif
947 } 901 }
… …
949 if (parent[0]) 903 if (parent[0])
950 { 904 {
951 resize_all_windows (0, 0, 0); 905 resize_all_windows (0, 0, 0);
952 scr_remap_chars (); 906 scr_remap_chars ();
953 scr_touch (true); 907 scr_touch (true);
954 } 908 }
955 909
956 return true; 910 return true;
957} 911}
958 912
913void
959void rxvt_term::set_string_property (Atom prop, const char *str, int len) 914rxvt_term::set_string_property (Atom prop, const char *str, int len)
960{ 915{
961 XChangeProperty (display->display, parent[0], 916 XChangeProperty (dpy, parent[0],
962 prop, XA_STRING, 8, PropModeReplace, 917 prop, XA_STRING, 8, PropModeReplace,
963 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 918 (const unsigned char *)str, len >= 0 ? len : strlen (str));
964} 919}
965 920
921void
966void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 922rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
967{ 923{
968 wchar_t *ws = rxvt_mbstowcs (str, len); 924 wchar_t *ws = rxvt_mbstowcs (str, len);
969 char *s = rxvt_wcstoutf8 (ws); 925 char *s = rxvt_wcstoutf8 (ws);
970 926
971 XChangeProperty (display->display, parent[0], 927 XChangeProperty (dpy, parent[0],
972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 928 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
973 (const unsigned char *)s, strlen (s)); 929 (const unsigned char *)s, strlen (s));
974 930
975 free (s); 931 free (s);
976 free (ws); 932 free (ws);
… …
995#if ENABLE_EWMH 951#if ENABLE_EWMH
996 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 952 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
997#endif 953#endif
998} 954}
999 955
956void
957rxvt_term::set_window_color (int idx, const char *color)
958{
1000#ifdef XTERM_COLOR_CHANGE 959#ifdef XTERM_COLOR_CHANGE
1001void
1002rxvt_term::set_window_color (int idx, const char *color)
1003{
1004 rxvt_color xcol; 960 rxvt_color xcol;
1005 int i; 961 int i;
1006 962
1007 if (color == NULL || *color == '\0') 963 if (color == NULL || *color == '\0')
1008 return; 964 return;
965
966 color = strdup (color);
967 allocated.push_back ((void *)color);
968 rs[Rs_color + idx] = color;
1009 969
1010 /* handle color aliases */ 970 /* handle color aliases */
1011 if (isdigit (*color)) 971 if (isdigit (*color))
1012 { 972 {
1013 i = atoi (color); 973 i = atoi (color);
1014 974
1015 if (i >= 8 && i <= 15) 975 if (i >= 8 && i <= 15)
1016 { /* bright colors */ 976 { /* bright colors */
1017 i -= 8; 977 i -= 8;
1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 978 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1019 SET_PIXCOLOR (idx);
1020 goto done; 979 goto done;
1021 } 980 }
1022 981
1023 if (i >= 0 && i <= 7) 982 if (i >= 0 && i <= 7)
1024 { /* normal colors */ 983 { /* normal colors */
1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 984 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1026 SET_PIXCOLOR (idx);
1027 goto done; 985 goto done;
1028 } 986 }
1029 } 987 }
1030 988
1031 if (!rXParseAllocColor (&xcol, color)) 989 set_color (xcol, color);
1032 return;
1033
1034 /* XStoreColor (display->display, display->cmap, XColor*); */
1035 990
1036 /* 991 /*
1037 * FIXME: should free colors here, but no idea how to do it so instead, 992 * FIXME: should free colors here, but no idea how to do it so instead,
1038 * so just keep gobbling up the colormap 993 * so just keep gobbling up the colormap
1039 */ 994 */
1040# if 0
1041 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[idx] == pix_colors[i])
1043 break;
1044 if (i > Color_White)
1045 {
1046 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1047 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1048 DisplayPlanes (display->display, display->screen));
1049 }
1050# endif
1051 995
1052 pix_colors_focused[idx] = xcol; 996 pix_colors_focused[idx] = xcol;
1053 SET_PIXCOLOR (idx);
1054 997
1055 /* XSetWindowAttributes attr; */ 998 /* XSetWindowAttributes attr; */
1056 /* Cursor cursor; */ 999 /* Cursor cursor; */
1057done: 1000done:
1058
1059#if OFF_FOCUS_FADING
1060 if (rs[Rs_fade])
1061 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1062#endif
1063
1064 /*TODO: handle Color_BD, scrollbar background, etc. */ 1001 /*TODO: handle Color_BD, scrollbar background, etc. */
1065 1002
1003 update_fade_color (idx);
1066 recolour_cursor (); 1004 recolour_cursor ();
1067 scr_recolour (); 1005 scr_recolour ();
1068}
1069
1070#else
1071# define set_window_color (idx,color) ((void)0)
1072#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
1007}
1073 1008
1074void 1009void
1075rxvt_term::recolour_cursor () 1010rxvt_term::recolour_cursor ()
1076{ 1011{
1077 XColor xcol[2]; 1012 XColor fg, bg;
1078 1013
1079 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1014 (ISSET_PIXCOLOR (Color_pointer_fg)
1080 ? pix_colors_focused[Color_pointer_fg] 1015 ? pix_colors_focused[Color_pointer_fg]
1081 : pix_colors_focused[Color_fg]; 1016 : pix_colors_focused[Color_fg]).get (fg);
1017
1082 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1018 (ISSET_PIXCOLOR (Color_pointer_bg)
1083 ? pix_colors_focused[Color_pointer_bg] 1019 ? pix_colors_focused[Color_pointer_bg]
1084 : pix_colors_focused[Color_bg]; 1020 : pix_colors_focused[Color_bg]).get (bg);
1085 1021
1086 XQueryColors (display->display, display->cmap, xcol, 2); 1022 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1087 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1088} 1023}
1089 1024
1090/*----------------------------------------------------------------------*/ 1025/*----------------------------------------------------------------------*/
1091/* 1026/*
1092 * find if fg/bg matches any of the normal (low-intensity) colors 1027 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1096{ 1031{
1097 unsigned int i; 1032 unsigned int i;
1098 const char *xpmb = "\0"; 1033 const char *xpmb = "\0";
1099 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1034 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1100 1035
1101 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1102 strcpy (fstr, "default"); 1036 strcpy (fstr, "default");
1103 strcpy (bstr, "default"); 1037 strcpy (bstr, "default");
1104 for (i = Color_Black; i <= Color_White; i++) 1038 for (i = Color_Black; i <= Color_White; i++)
1105 if (pix_colors[Color_fg] == pix_colors[i]) 1039 if (pix_colors[Color_fg] == pix_colors[i])
1106 { 1040 {
… …
1110 1044
1111 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
1112 if (pix_colors[Color_bg] == pix_colors[i]) 1046 if (pix_colors[Color_bg] == pix_colors[i])
1113 { 1047 {
1114 sprintf (bstr, "%d", (i - Color_Black)); 1048 sprintf (bstr, "%d", (i - Color_Black));
1115#ifdef XPM_BACKGROUND 1049#ifdef BG_IMAGE_FROM_FILE
1116 xpmb = "default;"; 1050 xpmb = "default;";
1117#endif 1051#endif
1118 break; 1052 break;
1119 } 1053 }
1120 1054
1121 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1055 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1122} 1056}
1123 1057
1124/*----------------------------------------------------------------------*/ 1058/*----------------------------------------------------------------------*/
1125 1059
1126int 1060bool
1127rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1061rxvt_term::set_color (rxvt_color &color, const char *name)
1128{ 1062{
1129 if (!screen_in_out->set (display, colour)) 1063 if (color.set (this, name))
1130 {
1131 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1132 return false;
1133 }
1134
1135 return true; 1064 return true;
1065
1066 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1067 return false;
1068}
1069
1070void
1071rxvt_term::alias_color (int dst, int src)
1072{
1073 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1136} 1074}
1137 1075
1138/* -------------------------------------------------------------------- * 1076/* -------------------------------------------------------------------- *
1139 * - WINDOW RESIZING - * 1077 * - WINDOW RESIZING - *
1140 * -------------------------------------------------------------------- */ 1078 * -------------------------------------------------------------------- */
1141void 1079void
1142rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1080rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1143{ 1081{
1144 int fix_screen; 1082 int fix_screen;
1145 int old_width = szHint.width, old_height = szHint.height; 1083 int old_width = szHint.width;
1146 dDisp; 1084 int old_height = szHint.height;
1147 1085
1148 window_calc (newwidth, newheight); 1086 window_calc (newwidth, newheight);
1087
1088 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1149 XSetWMNormalHints (disp, parent[0], &szHint); 1089 XSetWMNormalHints (dpy, parent[0], &szHint);
1150 1090
1151 if (!ignoreparent) 1091 if (!ignoreparent)
1152 { 1092 {
1153#ifdef SMART_RESIZE 1093#ifdef SMART_RESIZE
1154 /* 1094 /*
… …
1158 int x, y, x1, y1; 1098 int x, y, x1, y1;
1159 int dx, dy; 1099 int dx, dy;
1160 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1161 Window unused_cr; 1101 Window unused_cr;
1162 1102
1163 XTranslateCoordinates (disp, parent[0], display->root, 1103 XTranslateCoordinates (dpy, parent[0], display->root,
1164 0, 0, &x, &y, &unused_cr); 1104 0, 0, &x, &y, &unused_cr);
1165 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1105 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1166 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1167 /* 1107 /*
1168 * if display->root isn't the parent window, a WM will probably have offset 1108 * if display->root isn't the parent window, a WM will probably have offset
1169 * our position for handles and decorations. Counter it 1109 * our position for handles and decorations. Counter it
1170 */ 1110 */
… …
1172 { 1112 {
1173 x -= x1; 1113 x -= x1;
1174 y -= y1; 1114 y -= y1;
1175 } 1115 }
1176 1116
1177 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1117 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1178 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1118 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1179 dx = old_width - szHint.width; 1119 dx = old_width - szHint.width;
1180 dy = old_height - szHint.height; 1120 dy = old_height - szHint.height;
1181 1121
1182 /* Check position of the center of the window */ 1122 /* Check position of the center of the window */
1183 if (x < x1) /* left half */ 1123 if (x < x1) /* left half */
1184 dx = 0; 1124 dx = 0;
… …
1187 if (y < y1) /* top half */ 1127 if (y < y1) /* top half */
1188 dy = 0; 1128 dy = 0;
1189 else if (y == y1) /* exact center */ 1129 else if (y == y1) /* exact center */
1190 dy /= 2; 1130 dy /= 2;
1191 1131
1192 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1132 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1193 szHint.width, szHint.height); 1133 szHint.width, szHint.height);
1194#else 1134#else
1195 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1135 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1196#endif 1136#endif
1197 } 1137 }
1198 1138
1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1200 1140
1201 if (fix_screen || newwidth != old_width || newheight != old_height) 1141 if (fix_screen || newwidth != old_width || newheight != old_height)
1202 { 1142 {
1203 if (scrollBar.state) 1143 if (scrollBar.state)
1204 { 1144 {
1205 XMoveResizeWindow (disp, scrollBar.win, 1145 XMoveResizeWindow (dpy, scrollBar.win,
1206 window_sb_x, 0, 1146 window_sb_x, 0,
1207 scrollbar_TotalWidth (), szHint.height); 1147 scrollbar_TotalWidth (), szHint.height);
1208 resize_scrollbar (); 1148 resize_scrollbar ();
1209 } 1149 }
1210 1150
1211 XMoveResizeWindow (disp, vt, 1151 XMoveResizeWindow (dpy, vt,
1212 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1213 width, height); 1153 width, height);
1214 1154
1155#ifdef HAVE_BG_PIXMAP
1156 if (bgPixmap.window_size_sensitive ())
1157 update_background ();
1158#endif
1159
1215 scr_clear (); 1160 scr_clear ();
1216#ifdef XPM_BACKGROUND
1217 resize_pixmap ();
1218#endif
1219 } 1161 }
1220 1162
1221 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
1222 {
1223 int curr_screen = -1;
1224 int old_ncol = prev_ncol;
1225
1226 /* scr_reset only works on the primary screen */
1227 if (old_height) /* this is not the first time through */
1228 {
1229 unsigned int ocol = ncol;
1230 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1231 curr_screen = scr_change_screen (PRIMARY);
1232 ncol = ocol;
1233 }
1234
1235 scr_reset (); 1164 scr_reset ();
1236 1165
1237 if (curr_screen >= 0) /* this is not the first time through */ 1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1238 { 1167 //scr_touch (false);
1239 scr_change_screen (curr_screen);
1240 selection_check (old_ncol != ncol ? 4 : 0);
1241 }
1242 }
1243 1168
1244 old_width = szHint.width; 1169#ifdef HAVE_BG_PIXMAP
1245 old_height = szHint.height; 1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1246 1171// if (bgPixmap.pixmap)
1247#ifdef XPM_BACKGROUND
1248 if (pixmap)
1249 scr_touch (false); 1172// scr_touch (false);
1250#endif 1173#endif
1251 1174
1252#ifdef USE_XIM 1175#ifdef USE_XIM
1253 IMSetStatusPosition (); 1176 IMSetPosition ();
1254#endif 1177#endif
1255} 1178}
1256 1179
1257/* 1180/*
1258 * Set the width/height of the vt window in characters. Units are pixels. 1181 * Set the width/height of the vt window in characters. Units are pixels.
… …
1263{ 1186{
1264 XWindowAttributes wattr; 1187 XWindowAttributes wattr;
1265 1188
1266 if (newwidth == 0 || newheight == 0) 1189 if (newwidth == 0 || newheight == 0)
1267 { 1190 {
1268 XGetWindowAttributes (display->display, display->root, &wattr); 1191 XGetWindowAttributes (dpy, display->root, &wattr);
1269 1192
1270 if (newwidth == 0) 1193 if (newwidth == 0)
1271 newwidth = wattr.width - szHint.base_width; 1194 newwidth = wattr.width - szHint.base_width;
1272 if (newheight == 0) 1195 if (newheight == 0)
1273 newheight = wattr.height - szHint.base_height; 1196 newheight = wattr.height - szHint.base_height;
… …
1287#ifdef USE_XIM 1210#ifdef USE_XIM
1288 1211
1289void 1212void
1290rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1213rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1291{ 1214{
1292 fg = pix_colors[Color_fg]; 1215 fg = pix_colors [Color_fg];
1293 bg = pix_colors[Color_bg]; 1216 bg = pix_colors [Color_bg];
1294} 1217}
1295 1218
1296void 1219void
1297rxvt_term::im_set_size (XRectangle &size) 1220rxvt_term::im_set_size (XRectangle &size)
1298{ 1221{
… …
1335 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1258 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1336 1259
1337 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1260 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1338 *p = '\0'; 1261 *p = '\0';
1339 1262
1340 atom = XInternAtom (display->display, server, False); 1263 atom = XInternAtom (dpy, server, False);
1341 win = XGetSelectionOwner (display->display, atom); 1264 win = XGetSelectionOwner (dpy, atom);
1342 1265
1343 if (win != None) 1266 if (win != None)
1344 return True; 1267 return True;
1345 } 1268 }
1346 1269
… …
1353 XPoint nspot; 1276 XPoint nspot;
1354 XVaNestedList preedit_attr; 1277 XVaNestedList preedit_attr;
1355 1278
1356 if (!Input_Context 1279 if (!Input_Context
1357 || !focus 1280 || !focus
1358 || !(input_style & XIMPreeditPosition)) 1281 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1359 return; 1282 return;
1360 1283
1361 im_set_position (nspot); 1284 im_set_position (nspot);
1362 1285
1363 if (nspot.x == spot.x && nspot.y == spot.y) 1286 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1382 input_method = 0; 1305 input_method = 0;
1383 } 1306 }
1384 1307
1385 Input_Context = 0; 1308 Input_Context = 0;
1386} 1309}
1310
1311#ifdef ENABLE_XIM_ONTHESPOT
1312
1313static void
1314xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1315{
1316 ((rxvt_term *)client_data)->make_current ();
1317 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1318}
1319
1320static void
1321xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1325}
1326
1327static void
1328xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1329{
1330 rxvt_term *term = (rxvt_term *)client_data;
1331 XIMText *text = call_data->text;
1332
1333 term->make_current ();
1334
1335 if (text)
1336 {
1337 void *str;
1338
1339 if (!text->encoding_is_wchar && text->string.multi_byte)
1340 {
1341 // of course, X makes it ugly again
1342 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->rs[Rs_imLocale]);
1344
1345 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1346 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1347
1348 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->locale);
1350 }
1351 else
1352 str = (void *)text->string.wide_char;
1353
1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355 DT_INT, call_data->caret,
1356 DT_INT, call_data->chg_first,
1357 DT_INT, call_data->chg_length,
1358 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1359 DT_WCS_LEN, str, str ? (int)text->length : 0,
1360 DT_END));
1361 }
1362 else
1363 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1364 DT_INT, call_data->caret,
1365 DT_INT, call_data->chg_first,
1366 DT_INT, call_data->chg_length,
1367 DT_END));
1368}
1369
1370#if 0
1371static void
1372xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1373{
1374 ((rxvt_term *)client_data)->make_current ();
1375 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1376 DT_INT, call_data->position,
1377 DT_INT, call_data->direction,
1378 DT_INT, call_data->style,
1379 DT_END));
1380}
1381#endif
1382
1383#endif
1387 1384
1388/* 1385/*
1389 * Try to open a XIM with the current modifiers, then see if we can 1386 * Try to open a XIM with the current modifiers, then see if we can
1390 * open a suitable preedit type 1387 * open a suitable preedit type
1391 */ 1388 */
… …
1398 XRectangle rect, status_rect, needed_rect; 1395 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1396 unsigned long fg, bg;
1400 const char *p; 1397 const char *p;
1401 char **s; 1398 char **s;
1402 XIMStyles *xim_styles; 1399 XIMStyles *xim_styles;
1400#ifdef ENABLE_XIM_ONTHESPOT
1401 XIMCallback xcb[4];
1402#endif
1403 1403
1404 set_environ (envv); 1404 set_environ (envv);
1405 1405
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1407 return false;
1408 1408
1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410 input_method = display->get_xim (locale, modifiers); 1409 input_method = display->get_xim (locale, modifiers);
1411 if (input_method == NULL) 1410 if (input_method == NULL)
1412 return false; 1411 return false;
1413 1412
1414 xim = input_method->xim; 1413 xim = input_method->xim;
… …
1434 s = rxvt_splitcommastring (p); 1433 s = rxvt_splitcommastring (p);
1435 1434
1436 for (i = found = 0; !found && s[i]; i++) 1435 for (i = found = 0; !found && s[i]; i++)
1437 { 1436 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1437 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = (XIMPreeditPosition | XIMStatusNothing); 1438 input_style = XIMPreeditPosition | XIMStatusNothing;
1440 else if (!strcmp (s[i], "OffTheSpot")) 1439 else if (!strcmp (s[i], "OffTheSpot"))
1441 input_style = (XIMPreeditArea | XIMStatusArea); 1440 input_style = XIMPreeditArea | XIMStatusArea;
1442 else if (!strcmp (s[i], "Root")) 1441 else if (!strcmp (s[i], "Root"))
1443 input_style = (XIMPreeditNothing | XIMStatusNothing); 1442 input_style = XIMPreeditNothing | XIMStatusNothing;
1444 else if (!strcmp (s[i], "None")) 1443 else if (!strcmp (s[i], "None"))
1445 input_style = (XIMPreeditNone | XIMStatusNone); 1444 input_style = XIMPreeditNone | XIMStatusNone;
1445#ifdef ENABLE_XIM_ONTHESPOT
1446 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1447 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1448#endif
1449 else
1450 input_style = XIMPreeditNothing | XIMStatusNothing;
1446 1451
1447 for (j = 0; j < xim_styles->count_styles; j++) 1452 for (j = 0; j < xim_styles->count_styles; j++)
1448 if (input_style == xim_styles->supported_styles[j]) 1453 if (input_style == xim_styles->supported_styles[j])
1449 { 1454 {
1450 rxvt_freecommastring (s); 1455 rxvt_freecommastring (s);
… …
1488 "*", 1493 "*",
1489 fheight, 1494 fheight,
1490 fheight + 1, fheight - 1, 1495 fheight + 1, fheight - 1,
1491 fheight - 2, fheight + 2); 1496 fheight - 2, fheight + 2);
1492 1497
1493 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1498 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1494 &missing_charset_list, &missing_charset_count, &def_string); 1499 &missing_charset_list, &missing_charset_count, &def_string);
1495 1500
1496 if (missing_charset_list) 1501 if (missing_charset_list)
1497 XFreeStringList (missing_charset_list); 1502 XFreeStringList (missing_charset_list);
1498 1503
… …
1539 XNBackground, bg, 1544 XNBackground, bg,
1540 XNArea, &status_rect, 1545 XNArea, &status_rect,
1541 XNFontSet, fs, 1546 XNFontSet, fs,
1542 NULL); 1547 NULL);
1543 } 1548 }
1549#if ENABLE_XIM_ONTHESPOT
1550 else if (input_style & XIMPreeditCallbacks)
1551 {
1552 im_set_position (spot);
1553
1554 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1555 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1556 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1557# if 0
1558 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1559# endif
1560
1561 preedit_attr = XVaCreateNestedList (0,
1562 XNSpotLocation, &spot,
1563 XNPreeditStartCallback, &xcb[0],
1564 XNPreeditDoneCallback , &xcb[1],
1565 XNPreeditDrawCallback , &xcb[2],
1566# if 0
1567 XNPreeditCaretCallback, &xcb[3],
1568# endif
1569 NULL);
1570 }
1571#endif
1544 1572
1545 Input_Context = XCreateIC (xim, 1573 Input_Context = XCreateIC (xim,
1546 XNInputStyle, input_style, 1574 XNInputStyle, input_style,
1547 XNClientWindow, vt, 1575 XNClientWindow, vt,
1548 XNFocusWindow, parent[0], 1576 XNFocusWindow, parent[0],
… …
1550 preedit_attr, 1578 preedit_attr,
1551 status_attr ? XNStatusAttributes : NULL, 1579 status_attr ? XNStatusAttributes : NULL,
1552 status_attr, NULL); 1580 status_attr, NULL);
1553 1581
1554 if (preedit_attr) XFree (preedit_attr); 1582 if (preedit_attr) XFree (preedit_attr);
1555 if (status_attr) XFree (status_attr); 1583 if (status_attr) XFree (status_attr);
1556 if (fs) XFreeFontSet (display->display, fs); 1584 if (fs) XFreeFontSet (dpy, fs);
1557 1585
1558 if (Input_Context == NULL) 1586 if (Input_Context == NULL)
1559 { 1587 {
1560 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1588 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561 im_destroy (); 1589 im_destroy ();
1562 return false; 1590 return false;
1563 } 1591 }
1564 1592
1565 if (input_style & XIMPreeditArea) 1593#if 0
1594 // unfortunately, only the focus window is used by XIM, hard to fix
1595 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1596 vt_select_input ();
1597#endif
1598
1566 IMSetStatusPosition (); 1599 IMSetPosition ();
1567 1600
1568 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569 return true; 1601 return true;
1570} 1602}
1571 1603
1572void 1604void
1573rxvt_term::im_cb () 1605rxvt_term::im_cb ()
… …
1579 1611
1580 make_current (); 1612 make_current ();
1581 1613
1582 im_destroy (); 1614 im_destroy ();
1583 1615
1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585 if (Input_Context) 1616 if (Input_Context)
1586 return; 1617 return;
1587 1618
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1619#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1620 if (rs[Rs_imLocale])
… …
1631 SET_LOCALE (locale); 1662 SET_LOCALE (locale);
1632#endif 1663#endif
1633} 1664}
1634 1665
1635void 1666void
1636rxvt_term::IMSetStatusPosition () 1667rxvt_term::IMSetPosition ()
1637{ 1668{
1638 XRectangle preedit_rect, status_rect, *needed_rect; 1669 XRectangle preedit_rect, status_rect, *needed_rect;
1639 XVaNestedList preedit_attr, status_attr; 1670 XVaNestedList preedit_attr, status_attr;
1640 1671
1641 if (!Input_Context 1672 if (!Input_Context
1642 || !focus 1673 || !focus
1643 || !(input_style & XIMPreeditArea) 1674 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1644 || !IMisRunning ()) 1675 || !IMisRunning ())
1645 return; 1676 return;
1646 1677
1678 if (input_style & XIMPreeditPosition)
1679 {
1680 im_set_size (preedit_rect);
1681 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682
1683 XSetICValues (Input_Context,
1684 XNPreeditAttributes, preedit_attr, NULL);
1685 }
1686 else
1687 {
1647 /* Getting the necessary width of preedit area */ 1688 /* Getting the necessary width of preedit area */
1648 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1689 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1649 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1690 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1650 XFree (status_attr); 1691 XFree (status_attr);
1651 1692
1652 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1693 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1653 XFree (needed_rect); 1694 XFree (needed_rect);
1654 1695
1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1696 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1656 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1657 1698
1658 XSetICValues (Input_Context, 1699 XSetICValues (Input_Context,
1659 XNPreeditAttributes, preedit_attr, 1700 XNPreeditAttributes, preedit_attr,
1660 XNStatusAttributes, status_attr, NULL); 1701 XNStatusAttributes, status_attr,
1702 NULL);
1661 1703
1704 XFree (status_attr);
1705 }
1706
1662 XFree (preedit_attr); 1707 XFree (preedit_attr);
1663 XFree (status_attr);
1664} 1708}
1665#endif /* USE_XIM */ 1709#endif /* USE_XIM */
1666 1710
1667/*----------------------------------------------------------------------*/ 1711void
1668rxvt_t rxvt_current_term; 1712rxvt_term::get_window_origin (int &x, int &y)
1713{
1714 Window cr;
1715 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1716/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1717}
1718
1719Pixmap
1720rxvt_term::get_pixmap_property (int prop_id)
1721{
1722 if (prop_id > 0 && prop_id < NUM_XA)
1723 if (xa[prop_id])
1724 {
1725 int aformat;
1726 unsigned long nitems, bytes_after;
1727 Atom atype;
1728 unsigned char *prop = NULL;
1729 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1730 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1731 &nitems, &bytes_after, &prop);
1732 if (result == Success && prop && atype == XA_PIXMAP)
1733 {
1734 return *(Pixmap *)prop;
1735 }
1736 }
1737 return None;
1738}
1739
1740#ifdef HAVE_BG_PIXMAP
1741int
1742rxvt_term::update_background ()
1743{
1744 bgPixmap.invalidate ();
1745
1746 /* no chance of real time refresh if we are blurring! */
1747 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1748 bgPixmap.render ();
1749 else
1750 {
1751 update_background_ev.stop ();
1752
1753 if (!bgPixmap.need_client_side_rendering())
1754 update_background_ev.start (.05);
1755 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1756 update_background_ev.start (.20); /* very slow !!! */
1757 else
1758 update_background_ev.start (.07);
1759 }
1760
1761 return 0;
1762}
1763
1764void
1765rxvt_term::update_background_cb (ev::timer &w, int revents)
1766{
1767 bgPixmap.render ();
1768}
1769
1770#endif /* HAVE_BG_PIXMAP */
1669 1771
1670/*----------------------- end-of-file (C source) -----------------------*/ 1772/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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