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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.281 by root, Fri Dec 14 02:10:33 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 (destroy_ev.is_active ())
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
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
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 ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
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
469#if ENABLE_PERL 562#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */
485#endif
486
487 pty = rxvt_new_ptytty ();
488
489 create_windows (argc, argv);
490
491 dDisp;
492
493 init_xlocale ();
494
495 scr_reset (); // initialize screen
496
497#if 0
498 XSynchronize (disp, True);
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */
504#endif
505#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent))
507 {
508 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents ();
510 rootwin_ev.start (display, display->root); 563 rootwin_ev.start (display, display->root);
511 }
512#endif 564#endif
513 565
514 set_colorfgbg (); 566 set_colorfgbg ();
515 567
516 init_command (cmd_argv); 568 init_command (cmd_argv);
517 569
518 free (cmd_argv); 570 free (cmd_argv);
519 571
520 if (pty->pty >= 0) 572 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
522 574
523 check_ev.start (); 575 prepare_ev.start ();
524 576
525 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
526 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
527 XMapWindow (disp, vt); 589 XMapWindow (dpy, vt);
528 XMapWindow (disp, parent[0]); 590 XMapWindow (dpy, parent[0]);
529
530 return true;
531} 591}
532 592
533static struct sig_handlers 593static struct sig_handlers
534{ 594{
535 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
536 596
537 /* 597 /*
538 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
539 */ 599 */
540 void 600 void sig_term (ev::sig &w, int revents);
541 sig_term (sig_watcher &w) 601
602 sig_handlers ()
542 { 603 {
543#ifdef DEBUG_CMD 604 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum);
549 }
550
551 sig_handlers ()
552 : sw_term (this, &sig_handlers::sig_term),
553 sw_int (this, &sig_handlers::sig_term) 605 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
554 {
555 } 606 }
556} sig_handlers; 607} sig_handlers;
557 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
558char **rxvt_environ; // startup environment 617char **rxvt_environ; // startup environment
559 618
560void 619void
561rxvt_init () 620rxvt_init ()
562{ 621{
563 uid_t uid = getuid (); 622 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576 623
577 // drop privileges 624 if (!ev_default_loop (0))
578#if HAVE_SETRESUID 625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 626
594 rxvt_environ = environ; 627 rxvt_environ = environ;
595 628
596 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
598 631
599 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
600 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
601 634
602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
603 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
604 637
605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
645 return p; 678 return p;
646} 679}
647 680
648/*----------------------------------------------------------------------*/ 681/*----------------------------------------------------------------------*/
649/* 682/*
650 * window size/position calculcations for XSizeHint and other storage. 683 * window size/position calculations for XSizeHint and other storage.
651 * if width/height are non-zero then override calculated width/height 684 * if width/height are non-zero then override calculated width/height
652 */ 685 */
653void 686void
654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
655{ 688{
656 short recalc_x, recalc_y; 689 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 690 int x, y, sb_w, flags;
658 unsigned int w, h; 691 unsigned int w, h;
659 unsigned int max_width, max_height; 692 unsigned int max_width, max_height;
660 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 693
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 695 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 696 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 697
… …
730 759
731 if (scrollBar.state) 760 if (scrollBar.state)
732 { 761 {
733 sb_w = scrollbar_TotalWidth (); 762 sb_w = scrollbar_TotalWidth ();
734 szHint.base_width += sb_w; 763 szHint.base_width += sb_w;
764
735 if (!OPTION (Opt_scrollBar_right)) 765 if (!option (Opt_scrollBar_right))
736 window_vt_x += sb_w; 766 window_vt_x += sb_w;
737 } 767 }
738 768
739 szHint.width_inc = fwidth; 769 szHint.width_inc = fwidth;
740 szHint.height_inc = fheight; 770 szHint.height_inc = fheight;
741 szHint.min_width = szHint.base_width + szHint.width_inc; 771 szHint.min_width = szHint.base_width + szHint.width_inc;
742 szHint.min_height = szHint.base_height + szHint.height_inc; 772 szHint.min_height = szHint.base_height + szHint.height_inc;
743 773
744 if (newwidth && newwidth - szHint.base_width < max_width) 774 if (newwidth && newwidth - szHint.base_width < max_width)
745 { 775 {
746 szHint.width = newwidth; 776 szHint.width = newwidth;
… …
761 { 791 {
762 min_it (height, max_height); 792 min_it (height, max_height);
763 szHint.height = szHint.base_height + height; 793 szHint.height = szHint.base_height + height;
764 } 794 }
765 795
766 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 796 if (scrollBar.state && option (Opt_scrollBar_right))
767 window_sb_x = szHint.width - sb_w; 797 window_sb_x = szHint.width - sb_w;
768 798
769 if (recalc_x) 799 if (recalc_x)
770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801
771 if (recalc_y) 802 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
773 804
774 ncol = width / fwidth; 805 ncol = width / fwidth;
775 nrow = height / fheight; 806 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 807}
781 808
782/*----------------------------------------------------------------------*/ 809/*----------------------------------------------------------------------*/
783/* 810/*
784 * Tell the teletype handler what size the window is. 811 * Tell the teletype handler what size the window is.
… …
797 ws.ws_xpixel = width; 824 ws.ws_xpixel = width;
798 ws.ws_ypixel = height; 825 ws.ws_ypixel = height;
799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
800 827
801#if 0 828#if 0
802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 829 // TIOCSWINSZ is supposed to do this automatically and correctly
803 if (cmd_pid) /* force through to the command */ 830 if (cmd_pid) /* force through to the command */
804 kill (-cmd_pid, SIGWINCH); 831 kill (-cmd_pid, SIGWINCH);
805#endif 832#endif
806} 833}
807 834
… …
836 delete fontset[0]; 863 delete fontset[0];
837 fontset[0] = fs; 864 fontset[0] = fs;
838 865
839 prop = (*fs)[1]->properties (); 866 prop = (*fs)[1]->properties ();
840 prop.height += lineSpace; 867 prop.height += lineSpace;
868
841 fs->set_prop (prop); 869 fs->set_prop (prop, false);
842 870
843 fwidth = prop.width; 871 fwidth = prop.width;
844 fheight = prop.height; 872 fheight = prop.height;
845 fbase = prop.ascent; 873 fbase = prop.ascent;
846 874
… …
855 { 883 {
856 fontset[style] = fs = new rxvt_fontset (this); 884 fontset[style] = fs = new rxvt_fontset (this);
857 rxvt_fontprop prop2 = prop; 885 rxvt_fontprop prop2 = prop;
858 886
859 if (res) 887 if (res)
860 prop2.weight = prop2.slant = rxvt_fontprop::unset; 888 {
889 fs->populate (res);
890 fs->set_prop (prop2, false);
891 }
861 else 892 else
862 { 893 {
863 res = fontset[0]->fontdesc; 894 fs->populate (fontset[0]->fontdesc);
864 895
865 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;
866 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);
867 } 900 }
868 901
869 fs->populate (res);
870 fs->set_prop (prop2);
871 } 902 }
872#else 903#else
873 fontset[style] = fontset[0]; 904 fontset[style] = fontset[0];
874#endif 905#endif
875 } 906 }
… …
877 if (parent[0]) 908 if (parent[0])
878 { 909 {
879 resize_all_windows (0, 0, 0); 910 resize_all_windows (0, 0, 0);
880 scr_remap_chars (); 911 scr_remap_chars ();
881 scr_touch (true); 912 scr_touch (true);
882 } 913 }
883 914
884 return true; 915 return true;
885} 916}
886 917
918void
887void rxvt_term::set_string_property (Atom prop, const char *str, int len) 919rxvt_term::set_string_property (Atom prop, const char *str, int len)
888{ 920{
889 XChangeProperty (display->display, parent[0], 921 XChangeProperty (dpy, parent[0],
890 prop, XA_STRING, 8, PropModeReplace, 922 prop, XA_STRING, 8, PropModeReplace,
891 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 923 (const unsigned char *)str, len >= 0 ? len : strlen (str));
892} 924}
893 925
926void
894void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 927rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
895{ 928{
896 wchar_t *ws = rxvt_mbstowcs (str, len); 929 wchar_t *ws = rxvt_mbstowcs (str, len);
897 char *s = rxvt_wcstoutf8 (ws); 930 char *s = rxvt_wcstoutf8 (ws);
898 931
899 XChangeProperty (display->display, parent[0], 932 XChangeProperty (dpy, parent[0],
900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 933 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
901 (const unsigned char *)s, strlen (s)); 934 (const unsigned char *)s, strlen (s));
902 935
903 free (s); 936 free (s);
904 free (ws); 937 free (ws);
… …
923#if ENABLE_EWMH 956#if ENABLE_EWMH
924 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
925#endif 958#endif
926} 959}
927 960
961void
962rxvt_term::set_window_color (int idx, const char *color)
963{
928#ifdef XTERM_COLOR_CHANGE 964#ifdef XTERM_COLOR_CHANGE
929void
930rxvt_term::set_window_color (int idx, const char *color)
931{
932 rxvt_color xcol; 965 rxvt_color xcol;
933 int i; 966 int i;
934 967
935 if (color == NULL || *color == '\0') 968 if (color == NULL || *color == '\0')
936 return; 969 return;
937 970
971 color = strdup (color);
972 allocated.push_back ((void *)color);
973 rs[Rs_color + idx] = color;
974
938 /* handle color aliases */ 975 /* handle color aliases */
939 if (isdigit (*color)) 976 if (isdigit (*color))
940 { 977 {
941 i = atoi (color); 978 i = atoi (color);
942 979
943 if (i >= 8 && i <= 15) 980 if (i >= 8 && i <= 15)
981 {
944 { /* bright colors */ 982 /* bright colors */
945 i -= 8;
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
947 SET_PIXCOLOR (idx);
948 goto done; 984 goto done;
949 } 985 }
950 986
951 if (i >= 0 && i <= 7) 987 if (i >= 0 && i <= 7)
988 {
952 { /* normal colors */ 989 /* normal colors */
953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 990 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954 SET_PIXCOLOR (idx);
955 goto done; 991 goto done;
956 } 992 }
957 } 993 }
958 994
959 if (!rXParseAllocColor (&xcol, color)) 995 set_color (xcol, color);
960 return;
961
962 /* XStoreColor (display->display, display->cmap, XColor*); */
963 996
964 /* 997 /*
965 * 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,
966 * so just keep gobbling up the colormap 999 * so just keep gobbling up the colormap
967 */ 1000 */
968# if 0
969 for (i = Color_Black; i <= Color_White; i++)
970 if (pix_colors[idx] == pix_colors[i])
971 break;
972 if (i > Color_White)
973 {
974 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976 DisplayPlanes (display->display, display->screen));
977 }
978# endif
979 1001
980 pix_colors_focused[idx] = xcol; 1002 pix_colors_focused[idx] = xcol;
981 SET_PIXCOLOR (idx);
982 1003
983 /* XSetWindowAttributes attr; */
984 /* Cursor cursor; */
985done: 1004done:
986
987#if OFF_FOCUS_FADING
988 if (rs[Rs_fade])
989 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
990#endif
991
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 1005 /*TODO: handle Color_BD, scrollbar background, etc. */
993 1006
1007 update_fade_color (idx);
994 recolour_cursor (); 1008 recolour_cursor ();
995 scr_recolour (); 1009 scr_recolour ();
1010#endif /* XTERM_COLOR_CHANGE */
996} 1011}
997
998#else
999# define set_window_color (idx,color) ((void)0)
1000#endif /* XTERM_COLOR_CHANGE */
1001 1012
1002void 1013void
1003rxvt_term::recolour_cursor () 1014rxvt_term::recolour_cursor ()
1004{ 1015{
1005 XColor xcol[2]; 1016 XColor fg, bg;
1006 1017
1007 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1018 (ISSET_PIXCOLOR (Color_pointer_fg)
1008 ? pix_colors_focused[Color_pointer_fg] 1019 ? pix_colors_focused[Color_pointer_fg]
1009 : pix_colors_focused[Color_fg]; 1020 : pix_colors_focused[Color_fg]).get (fg);
1021
1010 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1022 (ISSET_PIXCOLOR (Color_pointer_bg)
1011 ? pix_colors_focused[Color_pointer_bg] 1023 ? pix_colors_focused[Color_pointer_bg]
1012 : pix_colors_focused[Color_bg]; 1024 : pix_colors_focused[Color_bg]).get (bg);
1013 1025
1014 XQueryColors (display->display, display->cmap, xcol, 2); 1026 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1015 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016} 1027}
1017 1028
1018/*----------------------------------------------------------------------*/ 1029/*----------------------------------------------------------------------*/
1019/* 1030/*
1020 * 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
1021 */ 1032 */
1022void 1033void
1023rxvt_term::set_colorfgbg () 1034rxvt_term::set_colorfgbg ()
1024{ 1035{
1025 unsigned int i; 1036 unsigned int i;
1026 const char *xpmb = "\0"; 1037 const char *xpmb = "";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 1039
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 1040 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 1041 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 1042 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 1043 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 1044 {
… …
1038 1048
1039 for (i = Color_Black; i <= Color_White; i++) 1049 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 1050 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 1051 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 1052 sprintf (bstr, "%d", (i - Color_Black));
1043#ifdef XPM_BACKGROUND 1053#ifdef BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 1054 xpmb = "default;";
1045#endif 1055#endif
1046 break; 1056 break;
1047 } 1057 }
1048 1058
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1059 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1050} 1060}
1051 1061
1052/*----------------------------------------------------------------------*/ 1062/*----------------------------------------------------------------------*/
1053 1063
1054int 1064bool
1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1065rxvt_term::set_color (rxvt_color &color, const char *name)
1056{ 1066{
1057 if (!screen_in_out->set (display, colour)) 1067 if (color.set (this, name))
1058 {
1059 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1060 return false;
1061 }
1062
1063 return true; 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]);
1064} 1078}
1065 1079
1066/* -------------------------------------------------------------------- * 1080/* -------------------------------------------------------------------- *
1067 * - WINDOW RESIZING - * 1081 * - WINDOW RESIZING - *
1068 * -------------------------------------------------------------------- */ 1082 * -------------------------------------------------------------------- */
1069void 1083void
1070rxvt_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)
1071{ 1085{
1072 int fix_screen; 1086 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1087 int old_width = szHint.width;
1074 dDisp; 1088 int old_height = szHint.height;
1075 1089
1076 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)))
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1093 XSetWMNormalHints (dpy, parent[0], &szHint);
1078 1094
1079 if (!ignoreparent) 1095 if (!ignoreparent)
1080 { 1096 {
1081#ifdef SMART_RESIZE 1097#ifdef SMART_RESIZE
1082 /* 1098 /*
… …
1086 int x, y, x1, y1; 1102 int x, y, x1, y1;
1087 int dx, dy; 1103 int dx, dy;
1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1104 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089 Window unused_cr; 1105 Window unused_cr;
1090 1106
1091 XTranslateCoordinates (disp, parent[0], display->root, 1107 XTranslateCoordinates (dpy, parent[0], display->root,
1092 0, 0, &x, &y, &unused_cr); 1108 0, 0, &x, &y, &unused_cr);
1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1109 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1110 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095 /* 1111 /*
1096 * 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
1097 * our position for handles and decorations. Counter it 1113 * our position for handles and decorations. Counter it
1098 */ 1114 */
… …
1100 { 1116 {
1101 x -= x1; 1117 x -= x1;
1102 y -= y1; 1118 y -= y1;
1103 } 1119 }
1104 1120
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1121 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1122 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1123 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1124 dy = old_height - szHint.height;
1109 1125
1110 /* Check position of the center of the window */ 1126 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1127 if (x < x1) /* left half */
1112 dx = 0; 1128 dx = 0;
… …
1115 if (y < y1) /* top half */ 1131 if (y < y1) /* top half */
1116 dy = 0; 1132 dy = 0;
1117 else if (y == y1) /* exact center */ 1133 else if (y == y1) /* exact center */
1118 dy /= 2; 1134 dy /= 2;
1119 1135
1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1136 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1121 szHint.width, szHint.height); 1137 szHint.width, szHint.height);
1122#else 1138#else
1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1139 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1124#endif 1140#endif
1125 } 1141 }
1126 1142
1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1143 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1128 1144
1129 if (fix_screen || newwidth != old_width || newheight != old_height) 1145 if (fix_screen || newwidth != old_width || newheight != old_height)
1130 { 1146 {
1131 if (scrollBar.state) 1147 if (scrollBar.state)
1132 { 1148 {
1133 XMoveResizeWindow (disp, scrollBar.win, 1149 XMoveResizeWindow (dpy, scrollBar.win,
1134 window_sb_x, 0, 1150 window_sb_x, 0,
1135 scrollbar_TotalWidth (), szHint.height); 1151 scrollbar_TotalWidth (), szHint.height);
1136 resize_scrollbar (); 1152 resize_scrollbar ();
1137 } 1153 }
1138 1154
1139 XMoveResizeWindow (disp, vt, 1155 XMoveResizeWindow (dpy, vt,
1140 window_vt_x, window_vt_y, 1156 window_vt_x, window_vt_y,
1141 width, height); 1157 width, height);
1142 1158
1159#ifdef HAVE_BG_PIXMAP
1160 if (bgPixmap.window_size_sensitive ())
1161 update_background ();
1162#endif
1163
1143 scr_clear (); 1164 scr_clear ();
1144#ifdef XPM_BACKGROUND
1145 resize_pixmap ();
1146#endif
1147 } 1165 }
1148 1166
1149 if (fix_screen || old_height == 0) 1167 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 1168 scr_reset ();
1164 1169
1165 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
1166 { 1171 //scr_touch (false);
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171 1172
1172 old_width = szHint.width; 1173#ifdef HAVE_BG_PIXMAP
1173 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 ?
1174 1175// if (bgPixmap.pixmap)
1175#ifdef XPM_BACKGROUND
1176 if (pixmap)
1177 scr_touch (false); 1176// scr_touch (false);
1178#endif 1177#endif
1179 1178
1180#ifdef USE_XIM 1179#ifdef USE_XIM
1181 IMSetStatusPosition (); 1180 IMSetPosition ();
1182#endif 1181#endif
1183} 1182}
1184 1183
1185/* 1184/*
1186 * 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.
… …
1191{ 1190{
1192 XWindowAttributes wattr; 1191 XWindowAttributes wattr;
1193 1192
1194 if (newwidth == 0 || newheight == 0) 1193 if (newwidth == 0 || newheight == 0)
1195 { 1194 {
1196 XGetWindowAttributes (display->display, display->root, &wattr); 1195 XGetWindowAttributes (dpy, display->root, &wattr);
1197 1196
1198 if (newwidth == 0) 1197 if (newwidth == 0)
1199 newwidth = wattr.width - szHint.base_width; 1198 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1199 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1200 newheight = wattr.height - szHint.base_height;
… …
1215#ifdef USE_XIM 1214#ifdef USE_XIM
1216 1215
1217void 1216void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1217rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{ 1218{
1220 fg = pix_colors[Color_fg]; 1219 fg = pix_colors [Color_fg];
1221 bg = pix_colors[Color_bg]; 1220 bg = pix_colors [Color_bg];
1222} 1221}
1223 1222
1224void 1223void
1225rxvt_term::im_set_size (XRectangle &size) 1224rxvt_term::im_set_size (XRectangle &size)
1226{ 1225{
… …
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264 1263
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1266 *p = '\0'; 1265 *p = '\0';
1267 1266
1268 atom = XInternAtom (display->display, server, False); 1267 atom = XInternAtom (dpy, server, False);
1269 win = XGetSelectionOwner (display->display, atom); 1268 win = XGetSelectionOwner (dpy, atom);
1270 1269
1271 if (win != None) 1270 if (win != None)
1272 return True; 1271 return True;
1273 } 1272 }
1274 1273
… …
1281 XPoint nspot; 1280 XPoint nspot;
1282 XVaNestedList preedit_attr; 1281 XVaNestedList preedit_attr;
1283 1282
1284 if (!Input_Context 1283 if (!Input_Context
1285 || !focus 1284 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1285 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1286 return;
1288 1287
1289 im_set_position (nspot); 1288 im_set_position (nspot);
1290 1289
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1290 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1309 input_method = 0;
1311 } 1310 }
1312 1311
1313 Input_Context = 0; 1312 Input_Context = 0;
1314} 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
1315 1388
1316/* 1389/*
1317 * 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
1318 * open a suitable preedit type 1391 * open a suitable preedit type
1319 */ 1392 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1399 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1400 unsigned long fg, bg;
1328 const char *p; 1401 const char *p;
1329 char **s; 1402 char **s;
1330 XIMStyles *xim_styles; 1403 XIMStyles *xim_styles;
1404#ifdef ENABLE_XIM_ONTHESPOT
1405 XIMCallback xcb[4];
1406#endif
1331 1407
1332 set_environ (envv); 1408 set_environ (envv);
1333 1409
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1410 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1411 return false;
1336 1412
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1413 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1414 if (input_method == NULL)
1340 return false; 1415 return false;
1341 1416
1342 xim = input_method->xim; 1417 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1437 s = rxvt_splitcommastring (p);
1363 1438
1364 for (i = found = 0; !found && s[i]; i++) 1439 for (i = found = 0; !found && s[i]; i++)
1365 { 1440 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1441 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1442 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1443 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1444 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1445 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1446 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1447 else if (!strcmp (s[i], "None"))
1373 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;
1374 1455
1375 for (j = 0; j < xim_styles->count_styles; j++) 1456 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1457 if (input_style == xim_styles->supported_styles[j])
1377 { 1458 {
1378 rxvt_freecommastring (s); 1459 rxvt_freecommastring (s);
… …
1416 "*", 1497 "*",
1417 fheight, 1498 fheight,
1418 fheight + 1, fheight - 1, 1499 fheight + 1, fheight - 1,
1419 fheight - 2, fheight + 2); 1500 fheight - 2, fheight + 2);
1420 1501
1421 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1502 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1422 &missing_charset_list, &missing_charset_count, &def_string); 1503 &missing_charset_list, &missing_charset_count, &def_string);
1423 1504
1424 if (missing_charset_list) 1505 if (missing_charset_list)
1425 XFreeStringList (missing_charset_list); 1506 XFreeStringList (missing_charset_list);
1426 1507
… …
1467 XNBackground, bg, 1548 XNBackground, bg,
1468 XNArea, &status_rect, 1549 XNArea, &status_rect,
1469 XNFontSet, fs, 1550 XNFontSet, fs,
1470 NULL); 1551 NULL);
1471 } 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
1472 1576
1473 Input_Context = XCreateIC (xim, 1577 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1578 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1579 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1580 XNFocusWindow, parent[0],
… …
1478 preedit_attr, 1582 preedit_attr,
1479 status_attr ? XNStatusAttributes : NULL, 1583 status_attr ? XNStatusAttributes : NULL,
1480 status_attr, NULL); 1584 status_attr, NULL);
1481 1585
1482 if (preedit_attr) XFree (preedit_attr); 1586 if (preedit_attr) XFree (preedit_attr);
1483 if (status_attr) XFree (status_attr); 1587 if (status_attr) XFree (status_attr);
1484 if (fs) XFreeFontSet (display->display, fs); 1588 if (fs) XFreeFontSet (dpy, fs);
1485 1589
1486 if (Input_Context == NULL) 1590 if (Input_Context == NULL)
1487 { 1591 {
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1592 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1593 im_destroy ();
1490 return false; 1594 return false;
1491 } 1595 }
1492 1596
1493 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
1494 IMSetStatusPosition (); 1603 IMSetPosition ();
1495 1604
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1605 return true;
1498} 1606}
1499 1607
1500void 1608void
1501rxvt_term::im_cb () 1609rxvt_term::im_cb ()
… …
1507 1615
1508 make_current (); 1616 make_current ();
1509 1617
1510 im_destroy (); 1618 im_destroy ();
1511 1619
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1620 if (Input_Context)
1514 return; 1621 return;
1515 1622
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1623#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1624 if (rs[Rs_imLocale])
… …
1559 SET_LOCALE (locale); 1666 SET_LOCALE (locale);
1560#endif 1667#endif
1561} 1668}
1562 1669
1563void 1670void
1564rxvt_term::IMSetStatusPosition () 1671rxvt_term::IMSetPosition ()
1565{ 1672{
1566 XRectangle preedit_rect, status_rect, *needed_rect; 1673 XRectangle preedit_rect, status_rect, *needed_rect;
1567 XVaNestedList preedit_attr, status_attr; 1674 XVaNestedList preedit_attr, status_attr;
1568 1675
1569 if (!Input_Context 1676 if (!Input_Context
1570 || !focus 1677 || !focus
1571 || !(input_style & XIMPreeditArea) 1678 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1572 || !IMisRunning ()) 1679 || !IMisRunning ())
1573 return; 1680 return;
1574 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 {
1575 /* Getting the necessary width of preedit area */ 1692 /* Getting the necessary width of preedit area */
1576 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1693 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1577 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1694 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1578 XFree (status_attr); 1695 XFree (status_attr);
1579 1696
1580 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1697 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1581 XFree (needed_rect); 1698 XFree (needed_rect);
1582 1699
1583 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1700 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1584 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1701 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1585 1702
1586 XSetICValues (Input_Context, 1703 XSetICValues (Input_Context,
1587 XNPreeditAttributes, preedit_attr, 1704 XNPreeditAttributes, preedit_attr,
1588 XNStatusAttributes, status_attr, NULL); 1705 XNStatusAttributes, status_attr,
1706 NULL);
1589 1707
1708 XFree (status_attr);
1709 }
1710
1590 XFree (preedit_attr); 1711 XFree (preedit_attr);
1591 XFree (status_attr);
1592} 1712}
1593#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 */
1594 1784
1595/*----------------------- end-of-file (C source) -----------------------*/ 1785/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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