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.252 by ayin, Mon Oct 8 07:05:23 2007 UTC vs.
Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC

… …
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-2008 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
49#endif 53# endif
54#endif
50 55
56struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
52 58
53// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
55 61
… …
88class rxvt_composite_vec rxvt_composite; 94class rxvt_composite_vec rxvt_composite;
89 95
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 97{
92 compose_char *cc; 98 compose_char *cc;
93 99
94 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 101 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 102 cc = (*this)[c1];
97 while (cc) 103 while (cc)
98 { 104 {
99 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
101 } 107 }
102 108
103 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
105 { 111 {
106 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
108 } 114 }
… …
147 153
148} 154}
149#endif 155#endif
150 156
151rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
152 : 158{
159#if HAVE_BG_PIXMAP
160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 177#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 179#endif
156#if HAVE_BG_PIXMAP 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 update_background_ev(this, &rxvt_term::update_background_cb), 181#ifdef USE_XIM
158#endif 182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 183#endif
177#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 186#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 187#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 189#endif
186 termwin_ev (this, &rxvt_term::x_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 197
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 199
197 termlist.push_back (this); 200 termlist.push_back (this);
198 201
199#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
201#endif 204#endif
202} 205}
203 206
204// clean up the most important stuff, do *not* call x or free mem etc. 207// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 208// for use before an emergency exit
209void
206void rxvt_term::emergency_cleanup () 210rxvt_term::emergency_cleanup ()
207{ 211{
208 if (cmd_pid) 212 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 213 kill (-cmd_pid, SIGHUP);
210 214
211 pty_ev.stop (); 215 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
224 delete fontset[i]; 228 delete fontset[i];
225#endif 229#endif
226 delete fontset[0]; 230 delete fontset[0];
227 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
228 if (display) 242 if (display)
229 { 243 {
230 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
231 246
232#ifdef USE_XIM 247#ifdef USE_XIM
233 im_destroy (); 248 im_destroy ();
234#endif 249#endif
235#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
260 252
261 delete drawable; 253 delete drawable;
262 // destroy all windows 254 // destroy all windows
263 if (parent[0]) 255 if (parent[0])
… …
271 pix_colors_unfocused [i].free (this); 263 pix_colors_unfocused [i].free (this);
272#endif 264#endif
273 } 265 }
274 266
275 clear (); 267 clear ();
276 }
277 268
278 delete [] pix_colors_focused; 269 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 270 displays.put (display);
271 }
284 272
285 scr_release (); 273 scr_release ();
286 274
287 /* clear all resources */ 275 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 277 free (allocated [i]);
290 278
291 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
292 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
293 free (env_display); 282 free (env_display);
294 free (env_term); 283 free (env_term);
295 free (locale); 284 free (locale);
296 free (v_buffer); 285 free (v_buffer);
… …
300 delete argv; 289 delete argv;
301 290
302#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
303 delete keyboard; 292 delete keyboard;
304#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
305} 297}
306 298
307// child has exited, usually destroys 299// child has exited, usually destroys
308void 300void
309rxvt_term::child_cb (child_watcher &w, int status) 301rxvt_term::child_cb (ev::child &w, int status)
310{ 302{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 304
313 cmd_pid = 0; 305 cmd_pid = 0;
314 306
… …
317} 309}
318 310
319void 311void
320rxvt_term::destroy () 312rxvt_term::destroy ()
321{ 313{
322 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
323 return; 315 return;
324 316
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 318
327#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
… …
331 if (display) 323 if (display)
332 { 324 {
333#if USE_XIM 325#if USE_XIM
334 im_ev.stop (display); 326 im_ev.stop (display);
335#endif 327#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
341#endif 331#endif
342 incr_ev.stop (); 332 incr_ev.stop ();
343 termwin_ev.stop (display); 333 termwin_ev.stop (display);
344 vt_ev.stop (display); 334 vt_ev.stop (display);
345 } 335 }
346 336
347 check_ev.stop (); 337 flush_ev.stop ();
348 pty_ev.stop (); 338 pty_ev.stop ();
349#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
351#endif 341#endif
352#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
… …
360#endif 350#endif
361#ifdef POINTER_BLANK 351#ifdef POINTER_BLANK
362 pointer_ev.stop (); 352 pointer_ev.stop ();
363#endif 353#endif
364 354
365 destroy_ev.start (0); 355 destroy_ev.start ();
366} 356}
367 357
368void 358void
369rxvt_term::destroy_cb (time_watcher &w) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 360{
371 make_current (); 361 make_current ();
372 362
373 delete this; 363 delete this;
374} 364}
… …
395 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
396 char number[32]; 386 char number[32];
397 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
404 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ); 399 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 401 }
412 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
413 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
414 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
415 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
416 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
417 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
418 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
419 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
420 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
421 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
422 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
424 mesg, BUFSIZ); 414 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
427 mesg, BUFSIZ); 417 mesg, BUFSIZ);
428 else 418 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 420 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 422 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 424 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 426}
437#endif 427#endif
438 428
439int 429int
… …
462 DisplayString (display)); 452 DisplayString (display));
463 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
465} 455}
466 456
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
555#endif
556
557 set_colorfgbg ();
558
559 init_command (cmd_argv);
560
561 free (cmd_argv);
562
563 if (pty->pty >= 0)
564 pty_ev.start (pty->pty, EVENT_READ);
565
566 check_ev.start ();
567
568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
583 return true;
584}
585
586static struct sig_handlers 457static struct sig_handlers
587{ 458{
588 sig_watcher sw_term, sw_int; 459 ev::sig sw_term, sw_int;
589 460
590 /* 461 /*
591 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
592 */ 463 */
593 void 464 void sig_term (ev::sig &w, int revents);
594 sig_term (sig_watcher &w) 465
466 sig_handlers ()
595 { 467 {
596 rxvt_emergency_cleanup (); 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597 signal (w.signum, SIG_DFL);
598 kill (getpid (), w.signum);
599 }
600
601 sig_handlers ()
602 : sw_term (this, &sig_handlers::sig_term),
603 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604 {
605 } 470 }
606} sig_handlers; 471} sig_handlers;
607 472
473void
474sig_handlers::sig_term (ev::sig &w, int revents)
475{
476 rxvt_emergency_cleanup ();
477 w.stop ();
478 kill (getpid (), w.signum);
479}
480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516
517# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1;
519# endif
520# if VTIME != VEOL
521 tio->c_cc[VTIME] = 0;
522# endif
523
524 /* input modes */
525 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
526# ifdef IMAXBEL
527 | IMAXBEL
528# endif
529 | IXON);
530
531 /* output modes */
532 tio->c_oflag = (OPOST | ONLCR);
533
534 /* control modes */
535 tio->c_cflag = (CS8 | CREAD);
536
537 /* local modes */
538 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
539# if defined (ECHOCTL) && defined (ECHOKE)
540 | ECHOCTL | ECHOKE
541# endif
542 | ECHOE | ECHOK);
543}
544
608char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
609 546
610void 547void
611rxvt_init () 548rxvt_init ()
612{ 549{
550 assert (("fontMask must not overlap other RS masks",
551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
552
553 rxvt_get_ttymode (&rxvt_term::def_tio);
554
555 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO);
558
613 ptytty::init (); 559 ptytty::init ();
560
561 if (!ev_default_loop ())
562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
614 563
615 rxvt_environ = environ; 564 rxvt_environ = environ;
616 565
617 signal (SIGHUP, SIG_IGN); 566 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 567 signal (SIGPIPE, SIG_IGN);
619 568
620 sig_handlers.sw_term.start (SIGTERM); 569 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621 sig_handlers.sw_int.start (SIGINT); 570 sig_handlers.sw_int.start (SIGINT); ev_unref ();
622
623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
624 /* signal (SIGURG, SIG_DFL); */
625 571
626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627 // TODO: handle this with exceptions and tolerate the memory loss 573 // TODO: handle this with exceptions and tolerate the memory loss
628 XSetIOErrorHandler (rxvt_xioerror_handler); 574 XSetIOErrorHandler (rxvt_xioerror_handler);
629 575
630 XrmInitialize (); 576 XrmInitialize ();
631}
632
633/* ------------------------------------------------------------------------- *
634 * MEMORY ALLOCATION WRAPPERS *
635 * ------------------------------------------------------------------------- */
636void *
637rxvt_malloc (size_t size)
638{
639 void *p = malloc (size);
640
641 if (!p)
642 rxvt_fatal ("memory allocation failure. aborting.\n");
643
644 return p;
645}
646
647void *
648rxvt_calloc (size_t number, size_t size)
649{
650 void *p = calloc (number, size);
651
652 if (!p)
653 rxvt_fatal ("memory allocation failure. aborting.\n");
654
655 return p;
656}
657
658void *
659rxvt_realloc (void *ptr, size_t size)
660{
661 void *p = realloc (ptr, size);
662
663 if (!p)
664 rxvt_fatal ("memory allocation failure. aborting.\n");
665
666 return p;
667} 577}
668 578
669/*----------------------------------------------------------------------*/ 579/*----------------------------------------------------------------------*/
670/* 580/*
671 * window size/position calculations for XSizeHint and other storage. 581 * window size/position calculations for XSizeHint and other storage.
… …
673 */ 583 */
674void 584void
675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 585rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
676{ 586{
677 short recalc_x, recalc_y; 587 short recalc_x, recalc_y;
678 int x, y, sb_w, flags; 588 int x, y, flags;
679 unsigned int w, h; 589 unsigned int w, h;
680 unsigned int max_width, max_height; 590 unsigned int max_width, max_height;
681 591
682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 592 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
683 szHint.win_gravity = NorthWestGravity; 593 szHint.win_gravity = NorthWestGravity;
… …
693 if (rs[Rs_geometry]) 603 if (rs[Rs_geometry])
694 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 604 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
695 605
696 if (flags & WidthValue) 606 if (flags & WidthValue)
697 { 607 {
608 if (!w)
609 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
610
698 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 611 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
699 szHint.flags |= USSize; 612 szHint.flags |= USSize;
700 } 613 }
701 614
702 if (flags & HeightValue) 615 if (flags & HeightValue)
703 { 616 {
617 if (!h)
618 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
619
704 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 620 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
705 szHint.flags |= USSize; 621 szHint.flags |= USSize;
706 } 622 }
707 623
708 if (flags & XValue) 624 if (flags & XValue)
709 { 625 {
… …
740 max_width = MAX_COLS * fwidth; 656 max_width = MAX_COLS * fwidth;
741 max_height = MAX_ROWS * fheight; 657 max_height = MAX_ROWS * fheight;
742 658
743 szHint.base_width = szHint.base_height = 2 * int_bwidth; 659 szHint.base_width = szHint.base_height = 2 * int_bwidth;
744 660
745 sb_w = 0;
746 window_vt_x = window_vt_y = int_bwidth; 661 window_vt_x = window_vt_y = int_bwidth;
747 662
748 if (scrollBar.state) 663 if (scrollBar.state)
749 { 664 {
750 sb_w = scrollbar_TotalWidth (); 665 int sb_w = scrollBar.total_width ();
751 szHint.base_width += sb_w; 666 szHint.base_width += sb_w;
752 667
753 if (!option (Opt_scrollBar_right)) 668 if (!option (Opt_scrollBar_right))
754 window_vt_x += sb_w; 669 window_vt_x += sb_w;
755 } 670 }
… …
779 { 694 {
780 min_it (height, max_height); 695 min_it (height, max_height);
781 szHint.height = szHint.base_height + height; 696 szHint.height = szHint.base_height + height;
782 } 697 }
783 698
784 if (scrollBar.state && option (Opt_scrollBar_right))
785 window_sb_x = szHint.width - sb_w;
786
787 if (recalc_x) 699 if (recalc_x)
788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 700 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789 701
790 if (recalc_y) 702 if (recalc_y)
791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
792 704
793 ncol = width / fwidth; 705 ncol = width / fwidth;
794 nrow = height / fheight; 706 nrow = height / fheight;
795} 707}
796 708
797/*----------------------------------------------------------------------*/ 709/*----------------------------------------------------------------------*/
798/* 710/*
… …
809 721
810 ws.ws_col = ncol; 722 ws.ws_col = ncol;
811 ws.ws_row = nrow; 723 ws.ws_row = nrow;
812 ws.ws_xpixel = width; 724 ws.ws_xpixel = width;
813 ws.ws_ypixel = height; 725 ws.ws_ypixel = height;
814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 726 ioctl (pty->pty, TIOCSWINSZ, &ws);
815 727
816#if 0 728#if 0
817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 729 // TIOCSWINSZ is supposed to do this automatically and correctly
818 if (cmd_pid) /* force through to the command */ 730 if (cmd_pid) /* force through to the command */
819 kill (-cmd_pid, SIGWINCH); 731 kill (-cmd_pid, SIGWINCH);
820#endif 732#endif
821} 733}
822 734
… …
849#endif 761#endif
850 762
851 delete fontset[0]; 763 delete fontset[0];
852 fontset[0] = fs; 764 fontset[0] = fs;
853 765
854 prop = (*fs)[1]->properties (); 766 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
855 prop.height += lineSpace; 767 prop.height += lineSpace;
768 prop.width += letterSpace;
856 769
857 fs->set_prop (prop, false); 770 fs->set_prop (prop, false);
858 771
859 fwidth = prop.width; 772 fwidth = prop.width;
860 fheight = prop.height; 773 fheight = prop.height;
… …
896 if (parent[0]) 809 if (parent[0])
897 { 810 {
898 resize_all_windows (0, 0, 0); 811 resize_all_windows (0, 0, 0);
899 scr_remap_chars (); 812 scr_remap_chars ();
900 scr_touch (true); 813 scr_touch (true);
901 } 814 }
902 815
903 return true; 816 return true;
904} 817}
905 818
819void
906void rxvt_term::set_string_property (Atom prop, const char *str, int len) 820rxvt_term::set_string_property (Atom prop, const char *str, int len)
907{ 821{
908 XChangeProperty (dpy, parent[0], 822 XChangeProperty (dpy, parent[0],
909 prop, XA_STRING, 8, PropModeReplace, 823 prop, XA_STRING, 8, PropModeReplace,
910 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 824 (const unsigned char *)str, len >= 0 ? len : strlen (str));
911} 825}
912 826
827void
828rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
829{
830 XTextProperty ct;
831
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 {
834 XSetTextProperty (dpy, parent[0], &ct, prop);
835 XFree (ct.value);
836 }
837}
838
839void
913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 840rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914{ 841{
915 wchar_t *ws = rxvt_mbstowcs (str, len); 842 wchar_t *ws = rxvt_mbstowcs (str, len);
916 char *s = rxvt_wcstoutf8 (ws); 843 char *s = rxvt_wcstoutf8 (ws);
917 844
918 XChangeProperty (dpy, parent[0], 845 XChangeProperty (dpy, parent[0],
… …
927/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
928/* xterm sequences - title, iconName, color (exptl) */ 855/* xterm sequences - title, iconName, color (exptl) */
929void 856void
930rxvt_term::set_title (const char *str) 857rxvt_term::set_title (const char *str)
931{ 858{
932 set_string_property (XA_WM_NAME, str); 859 set_mbstring_property (XA_WM_NAME, str);
933#if ENABLE_EWMH 860#if ENABLE_EWMH
934 set_utf8_property (xa[XA_NET_WM_NAME], str); 861 set_utf8_property (xa[XA_NET_WM_NAME], str);
935#endif 862#endif
936} 863}
937 864
938void 865void
939rxvt_term::set_icon_name (const char *str) 866rxvt_term::set_icon_name (const char *str)
940{ 867{
941 set_string_property (XA_WM_ICON_NAME, str); 868 set_mbstring_property (XA_WM_ICON_NAME, str);
942#if ENABLE_EWMH 869#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 870 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944#endif 871#endif
945} 872}
946 873
947void 874void
948rxvt_term::set_window_color (int idx, const char *color) 875rxvt_term::set_window_color (int idx, const char *color)
949{ 876{
950#ifdef XTERM_COLOR_CHANGE 877#ifdef XTERM_COLOR_CHANGE
951 rxvt_color xcol; 878 rxvt_color xcol;
952 int i; 879
953
954 if (color == NULL || *color == '\0') 880 if (color == NULL || *color == '\0')
955 return; 881 return;
956 882
957 color = strdup (color); 883 color = strdup (color);
958 allocated.push_back ((void *)color); 884 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color; 885 rs[Rs_color + idx] = color;
960 886
961 /* handle color aliases */ 887 /* handle color aliases */
962 if (isdigit (*color)) 888 if (isdigit (*color))
963 { 889 {
964 i = atoi (color); 890 int i = atoi (color);
965 891
966 if (i >= 8 && i <= 15) 892 if (i >= 8 && i <= 15)
893 {
967 { /* bright colors */ 894 /* bright colors */
968 i -= 8;
969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 895 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
970 goto done; 896 goto done;
971 } 897 }
972 898
973 if (i >= 0 && i <= 7) 899 if (i >= 0 && i <= 7)
900 {
974 { /* normal colors */ 901 /* normal colors */
975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 902 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976 goto done; 903 goto done;
977 } 904 }
978 } 905 }
979 906
… …
984 * so just keep gobbling up the colormap 911 * so just keep gobbling up the colormap
985 */ 912 */
986 913
987 pix_colors_focused[idx] = xcol; 914 pix_colors_focused[idx] = xcol;
988 915
989 /* XSetWindowAttributes attr; */
990 /* Cursor cursor; */
991done: 916done:
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 917 /*TODO: handle Color_BD, scrollbar background, etc. */
993 918
994 update_fade_color (idx); 919 update_fade_color (idx);
995 recolour_cursor (); 920 recolour_cursor ();
996 scr_recolour (); 921 scr_recolour ();
997#endif /* XTERM_COLOR_CHANGE */ 922#endif /* XTERM_COLOR_CHANGE */
998} 923}
999 924
1000void 925void
1001rxvt_term::recolour_cursor () 926rxvt_term::recolour_cursor ()
1002{ 927{
… …
1019 */ 944 */
1020void 945void
1021rxvt_term::set_colorfgbg () 946rxvt_term::set_colorfgbg ()
1022{ 947{
1023 unsigned int i; 948 unsigned int i;
1024 const char *xpmb = "\0"; 949 const char *xpmb = "";
1025 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 950 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1026 951
1027 strcpy (fstr, "default"); 952 strcpy (fstr, "default");
1028 strcpy (bstr, "default"); 953 strcpy (bstr, "default");
1029 for (i = Color_Black; i <= Color_White; i++) 954 for (i = Color_Black; i <= Color_White; i++)
… …
1074 int old_width = szHint.width; 999 int old_width = szHint.width;
1075 int old_height = szHint.height; 1000 int old_height = szHint.height;
1076 1001
1077 window_calc (newwidth, newheight); 1002 window_calc (newwidth, newheight);
1078 1003
1079 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1004 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1005
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint)
1008 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc);
1080 XSetWMNormalHints (dpy, parent[0], &szHint); 1010 XSetWMNormalHints (dpy, parent[0], &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc;
1012 }
1081 1013
1082 if (!ignoreparent) 1014 if (!ignoreparent)
1083 { 1015 {
1084#ifdef SMART_RESIZE 1016#ifdef SMART_RESIZE
1085 /* 1017 /*
… …
1125#else 1057#else
1126 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1127#endif 1059#endif
1128 } 1060 }
1129 1061
1062 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint);
1064
1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1131 1066
1132 if (fix_screen || newwidth != old_width || newheight != old_height) 1067 if (fix_screen || newwidth != old_width || newheight != old_height)
1133 { 1068 {
1134 if (scrollBar.state) 1069 if (scrollBar.state)
1135 { 1070 scrollBar.resize ();
1136 XMoveResizeWindow (dpy, scrollBar.win,
1137 window_sb_x, 0,
1138 scrollbar_TotalWidth (), szHint.height);
1139 resize_scrollbar ();
1140 }
1141 1071
1142 XMoveResizeWindow (dpy, vt, 1072 XMoveResizeWindow (dpy, vt,
1143 window_vt_x, window_vt_y, 1073 window_vt_x, window_vt_y,
1144 width, height); 1074 width, height);
1145 1075
1146#ifdef HAVE_BG_PIXMAP 1076#ifdef HAVE_BG_PIXMAP
1147 if (bgPixmap.window_size_sensitive ()) 1077 if (bgPixmap.window_size_sensitive ())
1148 update_background (); 1078 update_background ();
1149#endif 1079#endif
1150
1151 scr_clear ();
1152 } 1080 }
1153 1081
1154 if (fix_screen || old_height == 0) 1082 if (fix_screen || old_height == 0)
1155 scr_reset (); 1083 scr_reset ();
1156
1157 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 //scr_touch (false);
1159 1084
1160#ifdef HAVE_BG_PIXMAP 1085#ifdef HAVE_BG_PIXMAP
1161// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1162// if (bgPixmap.pixmap) 1087// if (bgPixmap.pixmap)
1163// scr_touch (false); 1088// scr_touch (false);
… …
1235 1160
1236/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1237bool 1162bool
1238rxvt_term::IMisRunning () 1163rxvt_term::IMisRunning ()
1239{ 1164{
1240 char *p;
1241 Atom atom; 1165 Atom atom;
1242 Window win; 1166 Window win;
1243 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1244 1168
1245 /* get current locale modifier */ 1169 /* get current locale modifier */
1246 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1247 { 1171 {
1248 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1249 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1250 1174
1251 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1252 *p = '\0'; 1176 *p = '\0';
1253 1177
1254 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1255 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1256 1180
… …
1323 1247
1324 term->make_current (); 1248 term->make_current ();
1325 1249
1326 if (text) 1250 if (text)
1327 { 1251 {
1328 void *str; 1252 wchar_t *str;
1329 1253
1330 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1331 { 1255 {
1332 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1333 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1334 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1335 1259
1336 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1337 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1338 1262
1339 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1340 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1341 } 1265 }
1342 else 1266 else
1343 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1344 1268
1345 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1346 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1347 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1348 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
1349 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1273 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1668 1592
1669 if (input_style & XIMPreeditPosition) 1593 if (input_style & XIMPreeditPosition)
1670 { 1594 {
1671 im_set_size (preedit_rect); 1595 im_set_size (preedit_rect);
1672 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1596 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1673 1597
1674 XSetICValues (Input_Context, 1598 XSetICValues (Input_Context,
1675 XNPreeditAttributes, preedit_attr, NULL); 1599 XNPreeditAttributes, preedit_attr, NULL);
1676 } 1600 }
1677 else 1601 else
1678 { 1602 {
… …
1695 XFree (status_attr); 1619 XFree (status_attr);
1696 } 1620 }
1697 1621
1698 XFree (preedit_attr); 1622 XFree (preedit_attr);
1699} 1623}
1700#endif /* USE_XIM */ 1624#endif /* USE_XIM */
1701 1625
1702void 1626void
1703rxvt_term::get_window_origin (int &x, int &y) 1627rxvt_term::get_window_origin (int &x, int &y)
1704{ 1628{
1705 Window cr; 1629 Window cr;
1706 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1707/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1708} 1631}
1709 1632
1710Pixmap 1633Pixmap
1711rxvt_term::get_pixmap_property (int prop_id) 1634rxvt_term::get_pixmap_property (int prop_id)
1712{ 1635{
… …
1719 unsigned char *prop = NULL; 1642 unsigned char *prop = NULL;
1720 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1643 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1721 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1644 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1722 &nitems, &bytes_after, &prop); 1645 &nitems, &bytes_after, &prop);
1723 if (result == Success && prop && atype == XA_PIXMAP) 1646 if (result == Success && prop && atype == XA_PIXMAP)
1724 {
1725 return *(Pixmap *)prop; 1647 return *(Pixmap *)prop;
1726 }
1727 } 1648 }
1649
1728 return None; 1650 return None;
1729} 1651}
1730 1652
1731#ifdef HAVE_BG_PIXMAP 1653#ifdef HAVE_BG_PIXMAP
1732int 1654
1655void
1733rxvt_term::update_background () 1656rxvt_term::update_background ()
1734{ 1657{
1658 if (update_background_ev.is_active ())
1659 return;
1660
1735 bgPixmap.invalidate (); 1661 bgPixmap.invalidate ();
1736 1662
1737 /* no chance of real time refresh if we are blurring ! */ 1663 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1738 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1664
1665 if (to_wait <= 0.)
1739 bgPixmap.render (); 1666 bgPixmap.render ();
1740 else 1667 else
1741 { 1668 update_background_ev.start (to_wait);
1669}
1670
1671void
1672rxvt_term::update_background_cb (ev::timer &w, int revents)
1673{
1674 make_current ();
1675
1742 update_background_ev.stop (); 1676 update_background_ev.stop ();
1743 if (!bgPixmap.need_client_side_rendering())
1744 update_background_ev.start (NOW + .05);
1745 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1746 update_background_ev.start (NOW + .2); /* very slow !!! */
1747 else
1748 update_background_ev.start (NOW + .07);
1749 }
1750 return 0;
1751}
1752
1753void
1754rxvt_term::update_background_cb (time_watcher &w)
1755{
1756 bgPixmap.render (); 1677 bgPixmap.render ();
1678 refresh_check ();
1757} 1679}
1758 1680
1759#endif /* HAVE_BG_PIXMAP */ 1681#endif /* HAVE_BG_PIXMAP */
1760 1682
1761/*----------------------- end-of-file (C source) -----------------------*/ 1683/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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