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.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.267 by root, Tue Nov 27 17:45:46 2007 UTC

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

Diff Legend

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