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

Diff Legend

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