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.190 by root, Thu Jan 19 20:30:36 2006 UTC vs.
Revision 1.262 by ayin, Wed Nov 21 09:15:33 2007 UTC

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

Diff Legend

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