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

Diff Legend

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