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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC

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

Diff Legend

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