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.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.271 by root, Tue Dec 4 16:33:42 2007 UTC

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

Diff Legend

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