ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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