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.188 by root, Wed Jan 18 08:33:34 2006 UTC vs.
Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
49#endif 45#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
58// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term;
60
53static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
54 62
55bool 63bool
56rxvt_set_locale (const char *locale) 64rxvt_set_locale (const char *locale) NOTHROW
57{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
58 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 72 return false;
60 73
61 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
63 return true; 76 return true;
64} 77}
65 78
66void 79void
67rxvt_push_locale (const char *locale) 80rxvt_push_locale (const char *locale) NOTHROW
68{ 81{
69 strcpy (savelocale, curlocale); 82 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 83 rxvt_set_locale (locale);
71} 84}
72 85
73void 86void
74rxvt_pop_locale () 87rxvt_pop_locale () NOTHROW
75{ 88{
76 rxvt_set_locale (savelocale); 89 rxvt_set_locale (savelocale);
77} 90}
78 91
79#if ENABLE_COMBINING 92#if ENABLE_COMBINING
80class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
81 94
82text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
83{ 96{
84 compose_char *cc; 97 compose_char *cc;
85 98
86 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
87 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
88 cc = (*this)[c1]; 101 cc = (*this)[c1];
89 while (cc) 102 while (cc)
90 { 103 {
… …
140} 153}
141#endif 154#endif
142 155
143rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
144 : 157 :
145#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
147#endif 163#endif
148#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 166#endif
151#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
165#endif 181#endif
166#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
167 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 184#endif
169#ifdef USE_XIM 185#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
187#endif
188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb),
171#endif 190#endif
172 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
174 check_ev (this, &rxvt_term::check_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
179{ 199{
180 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
181 201
182 termlist.push_back (this); 202 termlist.push_back (this);
183 203
184#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 205 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 206#endif
190} 207}
191 208
192// 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.
193// for use before an emergency exit 210// for use before an emergency exit
211void
194void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
195{ 213{
196 if (cmd_pid) 214 if (cmd_pid)
197 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
198 216
217 pty_ev.stop ();
199 delete pty; pty = 0; 218 delete pty; pty = 0;
200} 219}
201 220
202rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
203{ 222{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 223 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 224
208 emergency_cleanup (); 225 emergency_cleanup ();
209 226
210#if ENABLE_STYLES 227#if ENABLE_STYLES
… …
214#endif 231#endif
215 delete fontset[0]; 232 delete fontset[0];
216 233
217 if (display) 234 if (display)
218 { 235 {
219 dDisp;
220
221 selection_clear (); 236 selection_clear ();
222 237
223#ifdef USE_XIM 238#ifdef USE_XIM
224 im_destroy (); 239 im_destroy ();
225#endif 240#endif
226#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 244#endif
230#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 247#endif
233#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 259#endif
245#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 264#endif
250 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (dpy, gc);
251 266
252 delete drawable; 267 delete drawable;
253 // destroy all windows 268 // destroy all windows
254 if (parent[0]) 269 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
256 }
257 271
258 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
259 delete pix_colors_focused; 273 if (ISSET_PIXCOLOR (i))
274 {
275 pix_colors_focused [i].free (this);
260#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
261 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
262#endif 287#endif
263 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
264 displays.put (display); 292 displays.put (display);
265 293
266 scr_release (); 294 scr_release ();
267 295
268 /* clear all resources */ 296 /* clear all resources */
269 for (int i = 0; i < allocated.size (); i++) 297 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 298 free (allocated [i]);
271 299
272 free (selection.text); 300 free (selection.text);
273 // TODO: manage env vars in child only(!) 301 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 302 free (env_display);
276 free (env_term); 303 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 304 free (locale);
279 free (v_buffer); 305 free (v_buffer);
280 free (incr_buf); 306 free (incr_buf);
281 307
282 delete envv; 308 delete envv;
283 delete argv; 309 delete argv;
284 310
285#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
286 delete keyboard; 312 delete keyboard;
287#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
288} 317}
289 318
319// child has exited, usually destroys
290void 320void
291rxvt_term::child_exit () 321rxvt_term::child_cb (ev::child &w, int status)
292{ 322{
323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
324
293 cmd_pid = 0; 325 cmd_pid = 0;
294 326
295 if (!OPTION (Opt_hold)) 327 if (!option (Opt_hold))
296 destroy (); 328 destroy ();
297} 329}
298 330
299void 331void
300rxvt_term::destroy () 332rxvt_term::destroy ()
301{ 333{
302 if (destroy_ev.active) 334 if (destroy_ev.active)
303 return; 335 return;
304 336
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338
305#if ENABLE_OVERLAY 339#if ENABLE_OVERLAY
306 scr_overlay_off (); 340 scr_overlay_off ();
307#endif 341#endif
308 342
309 if (display) 343 if (display)
… …
312 im_ev.stop (display); 346 im_ev.stop (display);
313#endif 347#endif
314#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
315 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
316#endif 350#endif
317#if TRANSPARENT 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
318 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
319#endif 353#endif
320 incr_ev.stop (); 354 incr_ev.stop ();
321 termwin_ev.stop (display); 355 termwin_ev.stop (display);
322 vt_ev.stop (display); 356 vt_ev.stop (display);
323 } 357 }
324 358
325 check_ev.stop (); 359 prepare_ev.stop ();
326 pty_ev.stop (); 360 pty_ev.stop ();
327#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
328 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
329#endif 363#endif
330#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
338#endif 372#endif
339#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
340 pointer_ev.stop (); 374 pointer_ev.stop ();
341#endif 375#endif
342 376
343 destroy_ev.start (0); 377 destroy_ev.start ();
344} 378}
345 379
346void 380void
347rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
348{ 382{
349 make_current (); 383 make_current ();
350 384
351 delete this; 385 delete this;
352} 386}
… …
363{ 397{
364 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 398 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365 (*t)->emergency_cleanup (); 399 (*t)->emergency_cleanup ();
366} 400}
367 401
368#if ENABLE_FRILLS 402#if !ENABLE_MINIMAL
369static void 403static void
370print_x_error (Display *dpy, XErrorEvent *event) 404print_x_error (Display *dpy, XErrorEvent *event)
371{ 405{
372 char buffer[BUFSIZ]; 406 char buffer[BUFSIZ];
373 char mesg[BUFSIZ]; 407 char mesg[BUFSIZ];
… …
406 else 440 else
407 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
408 mesg, BUFSIZ); 442 mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
410 } 444 }
411 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
412 mesg, BUFSIZ); 446 mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
414} 448}
415#endif 449#endif
416 450
… …
421 GET_R->allowedxerror = event->error_code; 455 GET_R->allowedxerror = event->error_code;
422 else 456 else
423 { 457 {
424 // GET_R is most likely not the terminal which caused the error, 458 // GET_R is most likely not the terminal which caused the error,
425 // so just output the error and continue 459 // so just output the error and continue
426#if ENABLE_FRILLS 460#if ENABLE_MINIMAL
461 old_xerror_handler (display, event);
462#else
427 print_x_error (display, event); 463 print_x_error (display, event);
428#else
429 old_xerror_handler (display, event);
430#endif 464#endif
431 } 465 }
432 466
433 return 0; 467 return 0;
434} 468}
… …
442 _exit (EXIT_FAILURE); 476 _exit (EXIT_FAILURE);
443} 477}
444 478
445/*----------------------------------------------------------------------*/ 479/*----------------------------------------------------------------------*/
446bool 480bool
447rxvt_term::init (int argc, const char *const *argv) 481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 482{
483 this->envv = envv;
484
449 SET_R (this); 485 SET_R (this);
450 set_locale (""); 486 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 487 set_environ (envv); // few things in X do not call setlocale :(
452 488
453 if (!init_vars ()) 489 if (!init_vars ())
… …
460#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
461 keyboard->register_done (); 497 keyboard->register_done ();
462#endif 498#endif
463 499
464#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 503#endif
468 504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
469#if ENABLE_PERL 565#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483
484 create_windows (argc, argv);
485
486 dDisp;
487
488 init_xlocale ();
489
490 scr_reset (); // initialize screen
491
492#if 0
493 XSynchronize (disp, True);
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */
499#endif
500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent))
502 {
503 XSelectInput (disp, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
506 }
507#endif 567#endif
508
509 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]);
511 568
512 set_colorfgbg (); 569 set_colorfgbg ();
513 570
514 init_command (cmd_argv); 571 init_command (cmd_argv);
515 572
516 free (cmd_argv); 573 free (cmd_argv);
517 574
518 if (pty->pty >= 0) 575 if (pty->pty >= 0)
519 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
520 577
521 check_ev.start (); 578 prepare_ev.start ();
522 579
523 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
524 581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
525 return true; 595 return true;
526} 596}
527 597
528static struct sig_handlers 598static struct sig_handlers
529{ 599{
530 sig_watcher sw_chld, sw_term, sw_int; 600 ev::sig sw_term, sw_int;
531
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545 601
546 /* 602 /*
547 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
548 */ 604 */
549 void 605 void
550 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
551 { 607 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 609 w.stop ();
557 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
558 } 611 }
559 612
560 sig_handlers () 613 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 615 sw_int (this, &sig_handlers::sig_term)
564 { 616 {
565 } 617 }
566} sig_handlers; 618} sig_handlers;
567 619
568char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
569 621
570void 622void
571rxvt_init () 623rxvt_init ()
572{ 624{
573 uid_t uid = getuid (); 625 ptytty::init ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || gid != getegid ())
580 {
581#if PTYTTY_HELPER
582 rxvt_ptytty_server ();
583#else
584 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
586 626
587 // drop privileges 627 if (!ev::ev_default_loop (0))
588#if HAVE_SETRESUID 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
589 setresgid (gid, gid, gid);
590 setresuid (uid, uid, uid);
591#elif HAVE_SETREUID
592 setregid (gid, gid);
593 setreuid (uid, uid);
594#elif HAVE_SETUID
595 setgid (gid);
596 setuid (uid);
597#endif
598
599 if (uid != geteuid ()
600 || gid != getegid ())
601 rxvt_fatal ("unable to drop privileges, aborting.\n");
602 }
603 629
604 rxvt_environ = environ; 630 rxvt_environ = environ;
605 631
606 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
607 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
608 634
609 sig_handlers.sw_chld.start (SIGCHLD);
610 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
611 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
612 637
613 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
614 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
615 640
616 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
643 rxvt_fatal ("memory allocation failure. aborting.\n"); 668 rxvt_fatal ("memory allocation failure. aborting.\n");
644 669
645 return p; 670 return p;
646} 671}
647 672
648void * 673void *
649rxvt_realloc (void *ptr, size_t size) 674rxvt_realloc (void *ptr, size_t size)
650{ 675{
651 void *p = realloc (ptr, size); 676 void *p = realloc (ptr, size);
652 677
653 if (!p) 678 if (!p)
… …
656 return p; 681 return p;
657} 682}
658 683
659/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
660/* 685/*
661 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
662 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
663 */ 688 */
664void 689void
665rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
666{ 691{
667 short recalc_x, recalc_y; 692 short recalc_x, recalc_y;
668 int x, y, sb_w, flags; 693 int x, y, sb_w, flags;
669 unsigned int w, h; 694 unsigned int w, h;
670 unsigned int max_width, max_height; 695 unsigned int max_width, max_height;
671 dDisp;
672
673 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
674 ncol, nrow, szHint.width, szHint.height));
675 696
676 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
677 szHint.win_gravity = NorthWestGravity; 698 szHint.win_gravity = NorthWestGravity;
678 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 699 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
679 700
… …
741 762
742 if (scrollBar.state) 763 if (scrollBar.state)
743 { 764 {
744 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
745 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
767
746 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
747 window_vt_x += sb_w; 769 window_vt_x += sb_w;
748 } 770 }
749 771
750 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
751 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
752 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
753 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
754 776
755 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
756 { 778 {
757 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
772 { 794 {
773 min_it (height, max_height); 795 min_it (height, max_height);
774 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
775 } 797 }
776 798
777 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
778 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
779 801
780 if (recalc_x) 802 if (recalc_x)
781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804
782 if (recalc_y) 805 if (recalc_y)
783 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
784 807
785 ncol = width / fwidth; 808 ncol = width / fwidth;
786 nrow = height / fheight; 809 nrow = height / fheight;
787 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
788 ncol, nrow, szHint.width,
789 szHint.height));
790 return;
791} 810}
792 811
793/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
794/* 813/*
795 * Tell the teletype handler what size the window is. 814 * Tell the teletype handler what size the window is.
… …
847 delete fontset[0]; 866 delete fontset[0];
848 fontset[0] = fs; 867 fontset[0] = fs;
849 868
850 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
851 prop.height += lineSpace; 870 prop.height += lineSpace;
871
852 fs->set_prop (prop); 872 fs->set_prop (prop, false);
853 873
854 fwidth = prop.width; 874 fwidth = prop.width;
855 fheight = prop.height; 875 fheight = prop.height;
856 fbase = prop.ascent; 876 fbase = prop.ascent;
857 877
… …
866 { 886 {
867 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
868 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
869 889
870 if (res) 890 if (res)
871 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
872 else 895 else
873 { 896 {
874 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
875 898
876 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 899 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
877 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 900 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
901
902 fs->set_prop (prop2, true);
878 } 903 }
879 904
880 fs->populate (res);
881 fs->set_prop (prop2);
882 } 905 }
883#else 906#else
884 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
885#endif 908#endif
886 } 909 }
… …
888 if (parent[0]) 911 if (parent[0])
889 { 912 {
890 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
891 scr_remap_chars (); 914 scr_remap_chars ();
892 scr_touch (true); 915 scr_touch (true);
893 } 916 }
894 917
895 return true; 918 return true;
896} 919}
897 920
921void
898void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
899{ 923{
900 XChangeProperty (display->display, parent[0], 924 XChangeProperty (dpy, parent[0],
901 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
902 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
903} 927}
904 928
929void
905void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
906{ 931{
907 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
908 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
909 934
910 XChangeProperty (display->display, parent[0], 935 XChangeProperty (dpy, parent[0],
911 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
912 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
913 938
914 free (s); 939 free (s);
915 free (ws); 940 free (ws);
… …
934#if ENABLE_EWMH 959#if ENABLE_EWMH
935 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
936#endif 961#endif
937} 962}
938 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
939#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
940void
941rxvt_term::set_window_color (int idx, const char *color)
942{
943 rxvt_color xcol; 968 rxvt_color xcol;
944 int i; 969 int i;
945 970
946 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
947 return; 972 return;
973
974 color = strdup (color);
975 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color;
948 977
949 /* handle color aliases */ 978 /* handle color aliases */
950 if (isdigit (*color)) 979 if (isdigit (*color))
951 { 980 {
952 i = atoi (color); 981 i = atoi (color);
953 982
954 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
955 { /* bright colors */ 984 { /* bright colors */
956 i -= 8; 985 i -= 8;
957 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
958 SET_PIXCOLOR (idx);
959 goto done; 987 goto done;
960 } 988 }
961 989
962 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
963 { /* normal colors */ 991 { /* normal colors */
964 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
965 SET_PIXCOLOR (idx);
966 goto done; 993 goto done;
967 } 994 }
968 } 995 }
969 996
970 if (!rXParseAllocColor (&xcol, color)) 997 set_color (xcol, color);
971 return;
972
973 /* XStoreColor (display->display, display->cmap, XColor*); */
974 998
975 /* 999 /*
976 * FIXME: should free colors here, but no idea how to do it so instead, 1000 * FIXME: should free colors here, but no idea how to do it so instead,
977 * so just keep gobbling up the colormap 1001 * so just keep gobbling up the colormap
978 */ 1002 */
979# if 0
980 for (i = Color_Black; i <= Color_White; i++)
981 if (pix_colors[idx] == pix_colors[i])
982 break;
983 if (i > Color_White)
984 {
985 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
986 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
987 DisplayPlanes (display->display, display->screen));
988 }
989# endif
990 1003
991 pix_colors_focused[idx] = xcol; 1004 pix_colors_focused[idx] = xcol;
992 SET_PIXCOLOR (idx);
993 1005
994 /* XSetWindowAttributes attr; */ 1006 /* XSetWindowAttributes attr; */
995 /* Cursor cursor; */ 1007 /* Cursor cursor; */
996done: 1008done:
997
998#if OFF_FOCUS_FADING
999 if (rs[Rs_fade])
1000 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1001#endif
1002
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 1010
1011 update_fade_color (idx);
1005 recolour_cursor (); 1012 recolour_cursor ();
1006 scr_recolour (); 1013 scr_recolour ();
1014#endif /* XTERM_COLOR_CHANGE */
1007} 1015}
1008
1009#else
1010# define set_window_color (idx,color) ((void)0)
1011#endif /* XTERM_COLOR_CHANGE */
1012 1016
1013void 1017void
1014rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
1015{ 1019{
1016 XColor xcol[2]; 1020 XColor fg, bg;
1017 1021
1018 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1022 (ISSET_PIXCOLOR (Color_pointer_fg)
1019 ? pix_colors_focused[Color_pointer_fg] 1023 ? pix_colors_focused[Color_pointer_fg]
1020 : pix_colors_focused[Color_fg]; 1024 : pix_colors_focused[Color_fg]).get (fg);
1025
1021 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1026 (ISSET_PIXCOLOR (Color_pointer_bg)
1022 ? pix_colors_focused[Color_pointer_bg] 1027 ? pix_colors_focused[Color_pointer_bg]
1023 : pix_colors_focused[Color_bg]; 1028 : pix_colors_focused[Color_bg]).get (bg);
1024 1029
1025 XQueryColors (display->display, display->cmap, xcol, 2); 1030 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1026 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1027} 1031}
1028 1032
1029/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
1030/* 1034/*
1031 * find if fg/bg matches any of the normal (low-intensity) colors 1035 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1035{ 1039{
1036 unsigned int i; 1040 unsigned int i;
1037 const char *xpmb = "\0"; 1041 const char *xpmb = "\0";
1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1039 1043
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1041 strcpy (fstr, "default"); 1044 strcpy (fstr, "default");
1042 strcpy (bstr, "default"); 1045 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_fg] == pix_colors[i]) 1047 if (pix_colors[Color_fg] == pix_colors[i])
1045 { 1048 {
… …
1049 1052
1050 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
1051 if (pix_colors[Color_bg] == pix_colors[i]) 1054 if (pix_colors[Color_bg] == pix_colors[i])
1052 { 1055 {
1053 sprintf (bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
1054#ifdef XPM_BACKGROUND 1057#ifdef BG_IMAGE_FROM_FILE
1055 xpmb = "default;"; 1058 xpmb = "default;";
1056#endif 1059#endif
1057 break; 1060 break;
1058 } 1061 }
1059 1062
1060 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1061} 1064}
1062 1065
1063/*----------------------------------------------------------------------*/ 1066/*----------------------------------------------------------------------*/
1064 1067
1065int 1068bool
1066rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1069rxvt_term::set_color (rxvt_color &color, const char *name)
1067{ 1070{
1068 if (!screen_in_out->set (display, colour)) 1071 if (color.set (this, name))
1069 {
1070 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1071 return false;
1072 }
1073
1074 return true; 1072 return true;
1073
1074 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1075 return false;
1076}
1077
1078void
1079rxvt_term::alias_color (int dst, int src)
1080{
1081 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1075} 1082}
1076 1083
1077/* -------------------------------------------------------------------- * 1084/* -------------------------------------------------------------------- *
1078 * - WINDOW RESIZING - * 1085 * - WINDOW RESIZING - *
1079 * -------------------------------------------------------------------- */ 1086 * -------------------------------------------------------------------- */
1080void 1087void
1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1088rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1082{ 1089{
1083 int fix_screen; 1090 int fix_screen;
1084 int old_width = szHint.width, old_height = szHint.height; 1091 int old_width = szHint.width;
1085 dDisp; 1092 int old_height = szHint.height;
1086 1093
1087 window_calc (newwidth, newheight); 1094 window_calc (newwidth, newheight);
1095
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1088 XSetWMNormalHints (disp, parent[0], &szHint); 1097 XSetWMNormalHints (dpy, parent[0], &szHint);
1089 1098
1090 if (!ignoreparent) 1099 if (!ignoreparent)
1091 { 1100 {
1092#ifdef SMART_RESIZE 1101#ifdef SMART_RESIZE
1093 /* 1102 /*
… …
1097 int x, y, x1, y1; 1106 int x, y, x1, y1;
1098 int dx, dy; 1107 int dx, dy;
1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100 Window unused_cr; 1109 Window unused_cr;
1101 1110
1102 XTranslateCoordinates (disp, parent[0], display->root, 1111 XTranslateCoordinates (dpy, parent[0], display->root,
1103 0, 0, &x, &y, &unused_cr); 1112 0, 0, &x, &y, &unused_cr);
1104 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106 /* 1115 /*
1107 * if display->root isn't the parent window, a WM will probably have offset 1116 * if display->root isn't the parent window, a WM will probably have offset
1108 * our position for handles and decorations. Counter it 1117 * our position for handles and decorations. Counter it
1109 */ 1118 */
… …
1111 { 1120 {
1112 x -= x1; 1121 x -= x1;
1113 y -= y1; 1122 y -= y1;
1114 } 1123 }
1115 1124
1116 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1125 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1117 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1126 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1118 dx = old_width - szHint.width; 1127 dx = old_width - szHint.width;
1119 dy = old_height - szHint.height; 1128 dy = old_height - szHint.height;
1120 1129
1121 /* Check position of the center of the window */ 1130 /* Check position of the center of the window */
1122 if (x < x1) /* left half */ 1131 if (x < x1) /* left half */
1123 dx = 0; 1132 dx = 0;
… …
1126 if (y < y1) /* top half */ 1135 if (y < y1) /* top half */
1127 dy = 0; 1136 dy = 0;
1128 else if (y == y1) /* exact center */ 1137 else if (y == y1) /* exact center */
1129 dy /= 2; 1138 dy /= 2;
1130 1139
1131 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1132 szHint.width, szHint.height); 1141 szHint.width, szHint.height);
1133#else 1142#else
1134 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1135#endif 1144#endif
1136 } 1145 }
1137 1146
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 1148
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 1150 {
1142 if (scrollBar.state) 1151 if (scrollBar.state)
1143 { 1152 {
1144 XMoveResizeWindow (disp, scrollBar.win, 1153 XMoveResizeWindow (dpy, scrollBar.win,
1145 window_sb_x, 0, 1154 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height); 1155 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar (); 1156 resize_scrollbar ();
1148 } 1157 }
1149 1158
1150 XMoveResizeWindow (disp, vt, 1159 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1160 window_vt_x, window_vt_y,
1152 width, height); 1161 width, height);
1153 1162
1163#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ())
1165 update_background ();
1166#endif
1167
1154 scr_clear (); 1168 scr_clear ();
1155#ifdef XPM_BACKGROUND
1156 resize_pixmap ();
1157#endif
1158 } 1169 }
1159 1170
1160 if (fix_screen || old_height == 0) 1171 if (fix_screen || old_height == 0)
1161 {
1162 int curr_screen = -1;
1163 int old_ncol = prev_ncol;
1164
1165 /* scr_reset only works on the primary screen */
1166 if (old_height) /* this is not the first time through */
1167 {
1168 unsigned int ocol = ncol;
1169 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1170 curr_screen = scr_change_screen (PRIMARY);
1171 ncol = ocol;
1172 }
1173
1174 scr_reset (); 1172 scr_reset ();
1175 1173
1176 if (curr_screen >= 0) /* this is not the first time through */ 1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1177 { 1175 //scr_touch (false);
1178 scr_change_screen (curr_screen);
1179 selection_check (old_ncol != ncol ? 4 : 0);
1180 }
1181 }
1182 1176
1183 old_width = szHint.width; 1177#ifdef HAVE_BG_PIXMAP
1184 old_height = szHint.height; 1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1185 1179// if (bgPixmap.pixmap)
1186#ifdef XPM_BACKGROUND
1187 if (pixmap)
1188 scr_touch (false); 1180// scr_touch (false);
1189#endif 1181#endif
1190 1182
1191#ifdef USE_XIM 1183#ifdef USE_XIM
1192 IMSetStatusPosition (); 1184 IMSetPosition ();
1193#endif 1185#endif
1194} 1186}
1195 1187
1196/* 1188/*
1197 * Set the width/height of the vt window in characters. Units are pixels. 1189 * Set the width/height of the vt window in characters. Units are pixels.
… …
1202{ 1194{
1203 XWindowAttributes wattr; 1195 XWindowAttributes wattr;
1204 1196
1205 if (newwidth == 0 || newheight == 0) 1197 if (newwidth == 0 || newheight == 0)
1206 { 1198 {
1207 XGetWindowAttributes (display->display, display->root, &wattr); 1199 XGetWindowAttributes (dpy, display->root, &wattr);
1208 1200
1209 if (newwidth == 0) 1201 if (newwidth == 0)
1210 newwidth = wattr.width - szHint.base_width; 1202 newwidth = wattr.width - szHint.base_width;
1211 if (newheight == 0) 1203 if (newheight == 0)
1212 newheight = wattr.height - szHint.base_height; 1204 newheight = wattr.height - szHint.base_height;
… …
1226#ifdef USE_XIM 1218#ifdef USE_XIM
1227 1219
1228void 1220void
1229rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1221rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1230{ 1222{
1231 fg = pix_colors[Color_fg]; 1223 fg = pix_colors [Color_fg];
1232 bg = pix_colors[Color_bg]; 1224 bg = pix_colors [Color_bg];
1233} 1225}
1234 1226
1235void 1227void
1236rxvt_term::im_set_size (XRectangle &size) 1228rxvt_term::im_set_size (XRectangle &size)
1237{ 1229{
… …
1274 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1275 1267
1276 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1277 *p = '\0'; 1269 *p = '\0';
1278 1270
1279 atom = XInternAtom (display->display, server, False); 1271 atom = XInternAtom (dpy, server, False);
1280 win = XGetSelectionOwner (display->display, atom); 1272 win = XGetSelectionOwner (dpy, atom);
1281 1273
1282 if (win != None) 1274 if (win != None)
1283 return True; 1275 return True;
1284 } 1276 }
1285 1277
… …
1292 XPoint nspot; 1284 XPoint nspot;
1293 XVaNestedList preedit_attr; 1285 XVaNestedList preedit_attr;
1294 1286
1295 if (!Input_Context 1287 if (!Input_Context
1296 || !focus 1288 || !focus
1297 || !(input_style & XIMPreeditPosition)) 1289 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1298 return; 1290 return;
1299 1291
1300 im_set_position (nspot); 1292 im_set_position (nspot);
1301 1293
1302 if (nspot.x == spot.x && nspot.y == spot.y) 1294 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1321 input_method = 0; 1313 input_method = 0;
1322 } 1314 }
1323 1315
1324 Input_Context = 0; 1316 Input_Context = 0;
1325} 1317}
1318
1319#ifdef ENABLE_XIM_ONTHESPOT
1320
1321static void
1322xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1323{
1324 ((rxvt_term *)client_data)->make_current ();
1325 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1326}
1327
1328static void
1329xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1330{
1331 ((rxvt_term *)client_data)->make_current ();
1332 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1333}
1334
1335static void
1336xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1337{
1338 rxvt_term *term = (rxvt_term *)client_data;
1339 XIMText *text = call_data->text;
1340
1341 term->make_current ();
1342
1343 if (text)
1344 {
1345 void *str;
1346
1347 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 {
1349 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]);
1352
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1355
1356 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale);
1358 }
1359 else
1360 str = (void *)text->string.wide_char;
1361
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_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1367 DT_WCS_LEN, str, str ? (int)text->length : 0,
1368 DT_END));
1369 }
1370 else
1371 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1372 DT_INT, call_data->caret,
1373 DT_INT, call_data->chg_first,
1374 DT_INT, call_data->chg_length,
1375 DT_END));
1376}
1377
1378#if 0
1379static void
1380xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1381{
1382 ((rxvt_term *)client_data)->make_current ();
1383 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1384 DT_INT, call_data->position,
1385 DT_INT, call_data->direction,
1386 DT_INT, call_data->style,
1387 DT_END));
1388}
1389#endif
1390
1391#endif
1326 1392
1327/* 1393/*
1328 * Try to open a XIM with the current modifiers, then see if we can 1394 * Try to open a XIM with the current modifiers, then see if we can
1329 * open a suitable preedit type 1395 * open a suitable preedit type
1330 */ 1396 */
… …
1337 XRectangle rect, status_rect, needed_rect; 1403 XRectangle rect, status_rect, needed_rect;
1338 unsigned long fg, bg; 1404 unsigned long fg, bg;
1339 const char *p; 1405 const char *p;
1340 char **s; 1406 char **s;
1341 XIMStyles *xim_styles; 1407 XIMStyles *xim_styles;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 XIMCallback xcb[4];
1410#endif
1342 1411
1343 set_environ (envv); 1412 set_environ (envv);
1344 1413
1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1414 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1346 return false; 1415 return false;
1347 1416
1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1349 input_method = display->get_xim (locale, modifiers); 1417 input_method = display->get_xim (locale, modifiers);
1350 if (input_method == NULL) 1418 if (input_method == NULL)
1351 return false; 1419 return false;
1352 1420
1353 xim = input_method->xim; 1421 xim = input_method->xim;
… …
1373 s = rxvt_splitcommastring (p); 1441 s = rxvt_splitcommastring (p);
1374 1442
1375 for (i = found = 0; !found && s[i]; i++) 1443 for (i = found = 0; !found && s[i]; i++)
1376 { 1444 {
1377 if (!strcmp (s[i], "OverTheSpot")) 1445 if (!strcmp (s[i], "OverTheSpot"))
1378 input_style = (XIMPreeditPosition | XIMStatusNothing); 1446 input_style = XIMPreeditPosition | XIMStatusNothing;
1379 else if (!strcmp (s[i], "OffTheSpot")) 1447 else if (!strcmp (s[i], "OffTheSpot"))
1380 input_style = (XIMPreeditArea | XIMStatusArea); 1448 input_style = XIMPreeditArea | XIMStatusArea;
1381 else if (!strcmp (s[i], "Root")) 1449 else if (!strcmp (s[i], "Root"))
1382 input_style = (XIMPreeditNothing | XIMStatusNothing); 1450 input_style = XIMPreeditNothing | XIMStatusNothing;
1383 else if (!strcmp (s[i], "None")) 1451 else if (!strcmp (s[i], "None"))
1384 input_style = (XIMPreeditNone | XIMStatusNone); 1452 input_style = XIMPreeditNone | XIMStatusNone;
1453#ifdef ENABLE_XIM_ONTHESPOT
1454 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1455 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1456#endif
1457 else
1458 input_style = XIMPreeditNothing | XIMStatusNothing;
1385 1459
1386 for (j = 0; j < xim_styles->count_styles; j++) 1460 for (j = 0; j < xim_styles->count_styles; j++)
1387 if (input_style == xim_styles->supported_styles[j]) 1461 if (input_style == xim_styles->supported_styles[j])
1388 { 1462 {
1389 rxvt_freecommastring (s); 1463 rxvt_freecommastring (s);
… …
1427 "*", 1501 "*",
1428 fheight, 1502 fheight,
1429 fheight + 1, fheight - 1, 1503 fheight + 1, fheight - 1,
1430 fheight - 2, fheight + 2); 1504 fheight - 2, fheight + 2);
1431 1505
1432 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1506 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1433 &missing_charset_list, &missing_charset_count, &def_string); 1507 &missing_charset_list, &missing_charset_count, &def_string);
1434 1508
1435 if (missing_charset_list) 1509 if (missing_charset_list)
1436 XFreeStringList (missing_charset_list); 1510 XFreeStringList (missing_charset_list);
1437 1511
… …
1478 XNBackground, bg, 1552 XNBackground, bg,
1479 XNArea, &status_rect, 1553 XNArea, &status_rect,
1480 XNFontSet, fs, 1554 XNFontSet, fs,
1481 NULL); 1555 NULL);
1482 } 1556 }
1557#if ENABLE_XIM_ONTHESPOT
1558 else if (input_style & XIMPreeditCallbacks)
1559 {
1560 im_set_position (spot);
1561
1562 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1563 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1564 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1565# if 0
1566 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1567# endif
1568
1569 preedit_attr = XVaCreateNestedList (0,
1570 XNSpotLocation, &spot,
1571 XNPreeditStartCallback, &xcb[0],
1572 XNPreeditDoneCallback , &xcb[1],
1573 XNPreeditDrawCallback , &xcb[2],
1574# if 0
1575 XNPreeditCaretCallback, &xcb[3],
1576# endif
1577 NULL);
1578 }
1579#endif
1483 1580
1484 Input_Context = XCreateIC (xim, 1581 Input_Context = XCreateIC (xim,
1485 XNInputStyle, input_style, 1582 XNInputStyle, input_style,
1486 XNClientWindow, vt, 1583 XNClientWindow, vt,
1487 XNFocusWindow, parent[0], 1584 XNFocusWindow, parent[0],
… …
1489 preedit_attr, 1586 preedit_attr,
1490 status_attr ? XNStatusAttributes : NULL, 1587 status_attr ? XNStatusAttributes : NULL,
1491 status_attr, NULL); 1588 status_attr, NULL);
1492 1589
1493 if (preedit_attr) XFree (preedit_attr); 1590 if (preedit_attr) XFree (preedit_attr);
1494 if (status_attr) XFree (status_attr); 1591 if (status_attr) XFree (status_attr);
1495 if (fs) XFreeFontSet (display->display, fs); 1592 if (fs) XFreeFontSet (dpy, fs);
1496 1593
1497 if (Input_Context == NULL) 1594 if (Input_Context == NULL)
1498 { 1595 {
1499 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1596 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1500 im_destroy (); 1597 im_destroy ();
1501 return false; 1598 return false;
1502 } 1599 }
1503 1600
1504 if (input_style & XIMPreeditArea) 1601#if 0
1602 // unfortunately, only the focus window is used by XIM, hard to fix
1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1604 vt_select_input ();
1605#endif
1606
1505 IMSetStatusPosition (); 1607 IMSetPosition ();
1506 1608
1507 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1508 return true; 1609 return true;
1509} 1610}
1510 1611
1511void 1612void
1512rxvt_term::im_cb () 1613rxvt_term::im_cb ()
… …
1518 1619
1519 make_current (); 1620 make_current ();
1520 1621
1521 im_destroy (); 1622 im_destroy ();
1522 1623
1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1524 if (Input_Context) 1624 if (Input_Context)
1525 return; 1625 return;
1526 1626
1527#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1627#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1528 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
… …
1570 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1571#endif 1671#endif
1572} 1672}
1573 1673
1574void 1674void
1575rxvt_term::IMSetStatusPosition () 1675rxvt_term::IMSetPosition ()
1576{ 1676{
1577 XRectangle preedit_rect, status_rect, *needed_rect; 1677 XRectangle preedit_rect, status_rect, *needed_rect;
1578 XVaNestedList preedit_attr, status_attr; 1678 XVaNestedList preedit_attr, status_attr;
1579 1679
1580 if (!Input_Context 1680 if (!Input_Context
1581 || !focus 1681 || !focus
1582 || !(input_style & XIMPreeditArea) 1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1583 || !IMisRunning ()) 1683 || !IMisRunning ())
1584 return; 1684 return;
1585 1685
1686 if (input_style & XIMPreeditPosition)
1687 {
1688 im_set_size (preedit_rect);
1689 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1690
1691 XSetICValues (Input_Context,
1692 XNPreeditAttributes, preedit_attr, NULL);
1693 }
1694 else
1695 {
1586 /* Getting the necessary width of preedit area */ 1696 /* Getting the necessary width of preedit area */
1587 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1588 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1698 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1589 XFree (status_attr); 1699 XFree (status_attr);
1590 1700
1591 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1701 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1592 XFree (needed_rect); 1702 XFree (needed_rect);
1593 1703
1594 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1704 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1595 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1705 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1596 1706
1597 XSetICValues (Input_Context, 1707 XSetICValues (Input_Context,
1598 XNPreeditAttributes, preedit_attr, 1708 XNPreeditAttributes, preedit_attr,
1599 XNStatusAttributes, status_attr, NULL); 1709 XNStatusAttributes, status_attr,
1710 NULL);
1600 1711
1712 XFree (status_attr);
1713 }
1714
1601 XFree (preedit_attr); 1715 XFree (preedit_attr);
1602 XFree (status_attr);
1603} 1716}
1604#endif /* USE_XIM */ 1717#endif /* USE_XIM */
1605 1718
1606/*----------------------------------------------------------------------*/ 1719void
1607rxvt_t rxvt_current_term; 1720rxvt_term::get_window_origin (int &x, int &y)
1721{
1722 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725}
1726
1727Pixmap
1728rxvt_term::get_pixmap_property (int prop_id)
1729{
1730 if (prop_id > 0 && prop_id < NUM_XA)
1731 if (xa[prop_id])
1732 {
1733 int aformat;
1734 unsigned long nitems, bytes_after;
1735 Atom atype;
1736 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop;
1743 }
1744 }
1745 return None;
1746}
1747
1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757int
1758rxvt_term::update_background ()
1759{
1760 bgPixmap.invalidate ();
1761
1762 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1764 bgPixmap.render ();
1765 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778}
1779
1780void
1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{
1783 bgPixmap.render ();
1784}
1785
1786#endif /* HAVE_BG_PIXMAP */
1608 1787
1609/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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