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.195 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.271 by root, Tue Dec 4 16:33:42 2007 UTC

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

Diff Legend

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