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

Diff Legend

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