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

Diff Legend

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