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

Diff Legend

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