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

Diff Legend

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