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.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 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-2010 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 HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 97{
97 compose_char *cc; 98 compose_char *cc;
98 99
99 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 102 cc = (*this)[c1];
102 while (cc) 103 while (cc)
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 {
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 }
114 113
115 // allocate a new combination 114 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 116 {
118 static int seen; 117 static int seen;
119 118
120 if (!seen++) 119 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 121
123 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
124 } 123 }
125 124
126 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
152 151
153} 152}
154#endif 153#endif
155 154
156rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
157 : 156{
157#if HAVE_BG_PIXMAP
158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159#endif
160#ifdef CURSOR_BLINK
161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif
163#ifdef TEXT_BLINK
164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif
169#ifdef SELECTION_SCROLLING
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 177#endif
161#if HAVE_BG_PIXMAP 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 179#ifdef USE_XIM
163#endif 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 181#endif
182#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 184#endif
188#ifndef NO_BELL 185#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 187#endif
191 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 195
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 197
202 termlist.push_back (this); 198 termlist.push_back (this);
203 199
204#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
230 delete fontset[i]; 226 delete fontset[i];
231#endif 227#endif
232 delete fontset[0]; 228 delete fontset[0];
233 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
234 if (display) 240 if (display)
235 { 241 {
236 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
237 244
238#ifdef USE_XIM 245#ifdef USE_XIM
239 im_destroy (); 246 im_destroy ();
240#endif 247#endif
241#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 249 if (gc) XFreeGC (dpy, gc);
266 250
267 delete drawable; 251 delete drawable;
268 // destroy all windows 252 // destroy all windows
269 if (parent[0]) 253 if (parent[0])
… …
277 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
278#endif 262#endif
279 } 263 }
280 264
281 clear (); 265 clear ();
282 }
283 266
284 delete [] pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 bgPixmap.destroy ();
290 displays.put (display); 268 displays.put (display);
269 }
291 270
292 scr_release (); 271 scr_release ();
293 272
294 /* clear all resources */ 273 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 275 free (allocated [i]);
297 276
298 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
300 free (env_display); 280 free (env_display);
301 free (env_term); 281 free (env_term);
302 free (locale); 282 free (locale);
303 free (v_buffer); 283 free (v_buffer);
… …
307 delete argv; 287 delete argv;
308 288
309#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
310 delete keyboard; 290 delete keyboard;
311#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
312} 295}
313 296
314// child has exited, usually destroys 297// child has exited, usually destroys
315void 298void
316rxvt_term::child_cb (ev::child &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
… …
324} 307}
325 308
326void 309void
327rxvt_term::destroy () 310rxvt_term::destroy ()
328{ 311{
329 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
330 return; 313 return;
331 314
332 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
333 316
334#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
338 if (display) 321 if (display)
339 { 322 {
340#if USE_XIM 323#if USE_XIM
341 im_ev.stop (display); 324 im_ev.stop (display);
342#endif 325#endif
343#if HAVE_SCROLLBARS
344 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
345#endif
346#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
347 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
348#endif 329#endif
349 incr_ev.stop (); 330 incr_ev.stop ();
350 termwin_ev.stop (display); 331 termwin_ev.stop (display);
351 vt_ev.stop (display); 332 vt_ev.stop (display);
352 } 333 }
353 334
354 prepare_ev.stop (); 335 flush_ev.stop ();
355 pty_ev.stop (); 336 pty_ev.stop ();
356#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
357 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
358#endif 339#endif
359#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
376rxvt_term::destroy_cb (ev::idle &w, int revents) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
377{ 358{
378 make_current (); 359 make_current ();
379 360
380 delete this; 361 delete this;
362}
363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
381} 374}
382 375
383/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
384/* 377/*
385 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
399print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
400{ 393{
401 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
402 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
403 char number[32]; 396 char number[32];
404 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
405 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
407 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
408 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
409 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
411 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
412 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
413 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
414 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
415 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
416 mesg, BUFSIZ); 409 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
418 } 411 }
419 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
420 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
421 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
422 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
423 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
424 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
425 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
426 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
427 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
428 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
429 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
430 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
431 mesg, BUFSIZ); 424 mesg, BUFSIZ);
432 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
433 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
434 mesg, BUFSIZ); 427 mesg, BUFSIZ);
435 else 428 else
436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
437 mesg, BUFSIZ); 430 mesg, BUFSIZ);
438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
439 } 432 }
440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
441 mesg, BUFSIZ); 434 mesg, BUFSIZ);
442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
443} 436}
444#endif 437#endif
445 438
446int 439int
… …
469 DisplayString (display)); 462 DisplayString (display));
470 rxvt_emergency_cleanup (); 463 rxvt_emergency_cleanup ();
471 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
472} 465}
473 466
474/*----------------------------------------------------------------------*/
475bool
476rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
477{
478 this->envv = envv;
479
480 SET_R (this);
481 set_locale ("");
482 set_environ (envv); // few things in X do not call setlocale :(
483
484 if (!init_vars ())
485 return false;
486
487 init_secondary ();
488
489 const char **cmd_argv = init_resources (argc, argv);
490
491#ifdef KEYSYM_RESOURCE
492 keyboard->register_done ();
493#endif
494
495#ifdef HAVE_SCROLLBARS
496 if (option (Opt_scrollBar))
497 scrollBar.setIdle (); /* set existence for size calculations */
498#endif
499
500 pty = ptytty::create ();
501
502 create_windows (argc, argv);
503
504 init_xlocale ();
505
506 scr_reset (); // initialize screen
507
508#if 0
509 XSynchronize (dpy, True);
510#endif
511
512#ifdef HAVE_SCROLLBARS
513 if (option (Opt_scrollBar))
514 resize_scrollbar (); /* create and map scrollbar */
515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
520#ifdef ENABLE_TRANSPARENCY
521 if (option (Opt_transparent))
522 {
523 bgPixmap.set_transparent ();
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
534 XSelectInput (dpy, display->root, PropertyChangeMask);
535 rootwin_ev.start (display, display->root);
536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap] != NULL)
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != NULL)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
562#endif
563
564 set_colorfgbg ();
565
566 init_command (cmd_argv);
567
568 free (cmd_argv);
569
570 if (pty->pty >= 0)
571 pty_ev.start (pty->pty, ev::READ);
572
573 prepare_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
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
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589
590 return true;
591}
592
593static struct sig_handlers 467static struct sig_handlers
594{ 468{
595 ev::sig sw_term, sw_int; 469 ev::sig sw_term, sw_int;
596 470
597 /* 471 /*
598 * Catch a fatal signal and tidy up before quitting 472 * Catch a fatal signal and tidy up before quitting
599 */ 473 */
600 void
601 sig_term (ev::sig &w, int revents) 474 void sig_term (ev::sig &w, int revents);
475
476 sig_handlers ()
602 { 477 {
603 rxvt_emergency_cleanup (); 478 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
604 w.stop ();
605 kill (getpid (), w.signum);
606 }
607
608 sig_handlers ()
609 : sw_term (this, &sig_handlers::sig_term),
610 sw_int (this, &sig_handlers::sig_term) 479 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
611 {
612 } 480 }
613} sig_handlers; 481} sig_handlers;
614 482
483void
484sig_handlers::sig_term (ev::sig &w, int revents)
485{
486 rxvt_emergency_cleanup ();
487 w.stop ();
488 kill (getpid (), w.signum);
489}
490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
615char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
616 559
617void 560void
618rxvt_init () 561rxvt_init ()
619{ 562{
620 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
621 565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
622 if (!ev::ev_default_loop (0)) 572 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 574
625 rxvt_environ = environ; 575 rxvt_environ = environ;
626 576
627 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
629 579
630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 582
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
639 586
640 XrmInitialize (); 587 XrmInitialize ();
641}
642
643/* ------------------------------------------------------------------------- *
644 * MEMORY ALLOCATION WRAPPERS *
645 * ------------------------------------------------------------------------- */
646void *
647rxvt_malloc (size_t size)
648{
649 void *p = malloc (size);
650
651 if (!p)
652 rxvt_fatal ("memory allocation failure. aborting.\n");
653
654 return p;
655}
656
657void *
658rxvt_calloc (size_t number, size_t size)
659{
660 void *p = calloc (number, size);
661
662 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n");
664
665 return p;
666}
667
668void *
669rxvt_realloc (void *ptr, size_t size)
670{
671 void *p = realloc (ptr, size);
672
673 if (!p)
674 rxvt_fatal ("memory allocation failure. aborting.\n");
675
676 return p;
677} 588}
678 589
679/*----------------------------------------------------------------------*/ 590/*----------------------------------------------------------------------*/
680/* 591/*
681 * window size/position calculations for XSizeHint and other storage. 592 * window size/position calculations for XSizeHint and other storage.
… …
683 */ 594 */
684void 595void
685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 596rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
686{ 597{
687 short recalc_x, recalc_y; 598 short recalc_x, recalc_y;
688 int x, y, sb_w, flags; 599 int x, y, flags;
689 unsigned int w, h; 600 unsigned int w, h;
690 unsigned int max_width, max_height; 601 unsigned int max_width, max_height;
691 602
692 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 603 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
693 szHint.win_gravity = NorthWestGravity; 604 szHint.win_gravity = NorthWestGravity;
… …
703 if (rs[Rs_geometry]) 614 if (rs[Rs_geometry])
704 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 615 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
705 616
706 if (flags & WidthValue) 617 if (flags & WidthValue)
707 { 618 {
619 if (!w)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
708 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 622 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
709 szHint.flags |= USSize; 623 szHint.flags |= USSize;
710 } 624 }
711 625
712 if (flags & HeightValue) 626 if (flags & HeightValue)
713 { 627 {
628 if (!h)
629 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
630
714 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 631 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 632 szHint.flags |= USSize;
716 } 633 }
717 634
718 if (flags & XValue) 635 if (flags & XValue)
719 { 636 {
… …
750 max_width = MAX_COLS * fwidth; 667 max_width = MAX_COLS * fwidth;
751 max_height = MAX_ROWS * fheight; 668 max_height = MAX_ROWS * fheight;
752 669
753 szHint.base_width = szHint.base_height = 2 * int_bwidth; 670 szHint.base_width = szHint.base_height = 2 * int_bwidth;
754 671
755 sb_w = 0;
756 window_vt_x = window_vt_y = int_bwidth; 672 window_vt_x = window_vt_y = int_bwidth;
757 673
758 if (scrollBar.state) 674 if (scrollBar.state)
759 { 675 {
760 sb_w = scrollbar_TotalWidth (); 676 int sb_w = scrollBar.total_width ();
761 szHint.base_width += sb_w; 677 szHint.base_width += sb_w;
762 678
763 if (!option (Opt_scrollBar_right)) 679 if (!option (Opt_scrollBar_right))
764 window_vt_x += sb_w; 680 window_vt_x += sb_w;
765 } 681 }
… …
789 { 705 {
790 min_it (height, max_height); 706 min_it (height, max_height);
791 szHint.height = szHint.base_height + height; 707 szHint.height = szHint.base_height + height;
792 } 708 }
793 709
794 if (scrollBar.state && option (Opt_scrollBar_right))
795 window_sb_x = szHint.width - sb_w;
796
797 if (recalc_x) 710 if (recalc_x)
798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 711 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799 712
800 if (recalc_y) 713 if (recalc_y)
801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
802 715
803 ncol = width / fwidth; 716 ncol = width / fwidth;
804 nrow = height / fheight; 717 nrow = height / fheight;
805} 718}
806 719
807/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
808/* 721/*
… …
819 732
820 ws.ws_col = ncol; 733 ws.ws_col = ncol;
821 ws.ws_row = nrow; 734 ws.ws_row = nrow;
822 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
823 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
825 738
826#if 0 739#if 0
827 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
828 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
829 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
830#endif 743#endif
831} 744}
832 745
… …
859#endif 772#endif
860 773
861 delete fontset[0]; 774 delete fontset[0];
862 fontset[0] = fs; 775 fontset[0] = fs;
863 776
864 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
865 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
866 780
867 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
868 782
869 fwidth = prop.width; 783 fwidth = prop.width;
870 fheight = prop.height; 784 fheight = prop.height;
… …
920 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
921 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
922} 836}
923 837
924void 838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
925rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
926{ 852{
927 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
928 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
929 855
… …
939/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
940/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
941void 867void
942rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
943{ 869{
944 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
945#if ENABLE_EWMH 871#if ENABLE_EWMH
946 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
947#endif 873#endif
948} 874}
949 875
950void 876void
951rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
952{ 878{
953 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
954#if ENABLE_EWMH 880#if ENABLE_EWMH
955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
956#endif 882#endif
957} 883}
958 884
959void 885void
960rxvt_term::set_window_color (int idx, const char *color) 886rxvt_term::set_window_color (int idx, const char *color)
961{ 887{
962#ifdef XTERM_COLOR_CHANGE 888#ifdef XTERM_COLOR_CHANGE
963 rxvt_color xcol; 889 rxvt_color xcol;
964 int i;
965 890
966 if (color == NULL || *color == '\0') 891 if (color == NULL || *color == '\0')
967 return; 892 return;
968 893
969 color = strdup (color); 894 color = strdup (color);
… …
971 rs[Rs_color + idx] = color; 896 rs[Rs_color + idx] = color;
972 897
973 /* handle color aliases */ 898 /* handle color aliases */
974 if (isdigit (*color)) 899 if (isdigit (*color))
975 { 900 {
976 i = atoi (color); 901 int i = atoi (color);
977 902
978 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
904 {
979 { /* bright colors */ 905 /* bright colors */
980 i -= 8;
981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
982 goto done; 907 goto done;
983 } 908 }
984 909
985 if (i >= 0 && i <= 7) 910 if (i >= 0 && i <= 7)
911 {
986 { /* normal colors */ 912 /* normal colors */
987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
988 goto done; 914 goto done;
989 } 915 }
990 } 916 }
991 917
… …
996 * so just keep gobbling up the colormap 922 * so just keep gobbling up the colormap
997 */ 923 */
998 924
999 pix_colors_focused[idx] = xcol; 925 pix_colors_focused[idx] = xcol;
1000 926
1001 /* XSetWindowAttributes attr; */
1002 /* Cursor cursor; */
1003done: 927done:
1004 /*TODO: handle Color_BD, scrollbar background, etc. */ 928 /*TODO: handle Color_BD, scrollbar background, etc. */
1005 929
1006 update_fade_color (idx); 930 update_fade_color (idx);
1007 recolour_cursor (); 931 recolour_cursor ();
… …
1031 */ 955 */
1032void 956void
1033rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
1034{ 958{
1035 unsigned int i; 959 unsigned int i;
1036 const char *xpmb = "\0"; 960 const char *xpmb = "";
1037 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
1038 963
1039 strcpy (fstr, "default");
1040 strcpy (bstr, "default");
1041 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
1043 { 966 {
1044 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
1045 break; 968 break;
1046 } 969 }
1047 970
1048 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
1049 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
1050 { 973 {
1051 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
1052#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
1053 xpmb = "default;"; 976 xpmb = "default;";
1054#endif 977#endif
1055 break; 978 break;
1056 } 979 }
… …
1086 int old_width = szHint.width; 1009 int old_width = szHint.width;
1087 int old_height = szHint.height; 1010 int old_height = szHint.height;
1088 1011
1089 window_calc (newwidth, newheight); 1012 window_calc (newwidth, newheight);
1090 1013
1091 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1014 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1015
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint)
1018 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc);
1092 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent[0], &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc;
1022 }
1093 1023
1094 if (!ignoreparent) 1024 if (!ignoreparent)
1095 { 1025 {
1096#ifdef SMART_RESIZE 1026#ifdef SMART_RESIZE
1097 /* 1027 /*
… …
1137#else 1067#else
1138 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1139#endif 1069#endif
1140 } 1070 }
1141 1071
1072 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint);
1074
1142 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1143 1076
1144 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
1145 { 1078 {
1146 if (scrollBar.state) 1079 if (scrollBar.state)
1147 { 1080 scrollBar.resize ();
1148 XMoveResizeWindow (dpy, scrollBar.win,
1149 window_sb_x, 0,
1150 scrollbar_TotalWidth (), szHint.height);
1151 resize_scrollbar ();
1152 }
1153 1081
1154 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1155 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1156 width, height); 1084 width, height);
1157 1085
1158#ifdef HAVE_BG_PIXMAP 1086#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ()) 1087 if (bgPixmap.window_size_sensitive ())
1160 update_background (); 1088 update_background ();
1161#endif 1089#endif
1162
1163 scr_clear ();
1164 } 1090 }
1165 1091
1166 if (fix_screen || old_height == 0) 1092 if (fix_screen || old_height == 0)
1167 scr_reset (); 1093 scr_reset ();
1168
1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1170 //scr_touch (false);
1171
1172#ifdef HAVE_BG_PIXMAP
1173// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174// if (bgPixmap.pixmap)
1175// scr_touch (false);
1176#endif
1177 1094
1178#ifdef USE_XIM 1095#ifdef USE_XIM
1179 IMSetPosition (); 1096 IMSetPosition ();
1180#endif 1097#endif
1181} 1098}
… …
1247 1164
1248/* Checking whether input method is running. */ 1165/* Checking whether input method is running. */
1249bool 1166bool
1250rxvt_term::IMisRunning () 1167rxvt_term::IMisRunning ()
1251{ 1168{
1252 char *p;
1253 Atom atom; 1169 Atom atom;
1254 Window win; 1170 Window win;
1255 char server[IMBUFSIZ]; 1171 char server[IMBUFSIZ];
1256 1172
1257 /* get current locale modifier */ 1173 /* get current locale modifier */
1258 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1174 if (char *p = XSetLocaleModifiers (0))
1259 { 1175 {
1260 strcpy (server, "@server="); 1176 strcpy (server, "@server=");
1261 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1177 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1262 1178
1263 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1179 if (p = strchr (server + 1, '@')) /* first one only */
1264 *p = '\0'; 1180 *p = '\0';
1265 1181
1266 atom = XInternAtom (dpy, server, False); 1182 atom = XInternAtom (dpy, server, False);
1267 win = XGetSelectionOwner (dpy, atom); 1183 win = XGetSelectionOwner (dpy, atom);
1268 1184
… …
1335 1251
1336 term->make_current (); 1252 term->make_current ();
1337 1253
1338 if (text) 1254 if (text)
1339 { 1255 {
1340 void *str; 1256 wchar_t *str;
1341 1257
1342 if (!text->encoding_is_wchar && text->string.multi_byte) 1258 if (!text->encoding_is_wchar && text->string.multi_byte)
1343 { 1259 {
1344 // of course, X makes it ugly again 1260 // of course, X makes it ugly again
1345 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->rs[Rs_imLocale]); 1262 SET_LOCALE (term->rs[Rs_imLocale]);
1347 1263
1348 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1264 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1349 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1265 mbstowcs (str, text->string.multi_byte, text->length + 1);
1350 1266
1351 if (term->rs[Rs_imLocale]) 1267 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->locale); 1268 SET_LOCALE (term->locale);
1353 } 1269 }
1354 else 1270 else
1355 str = (void *)text->string.wide_char; 1271 str = text->string.wide_char;
1356 1272
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1273 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret, 1274 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first, 1275 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length, 1276 DT_INT, call_data->chg_length,
… …
1431 p = pet[pi]; 1347 p = pet[pi];
1432 1348
1433 if (!p) 1349 if (!p)
1434 continue; 1350 continue;
1435 1351
1436 s = rxvt_splitcommastring (p); 1352 s = rxvt_strsplit (',', p);
1437 1353
1438 for (i = found = 0; !found && s[i]; i++) 1354 for (i = found = 0; !found && s[i]; i++)
1439 { 1355 {
1440 if (!strcmp (s[i], "OverTheSpot")) 1356 if (!strcmp (s[i], "OverTheSpot"))
1441 input_style = XIMPreeditPosition | XIMStatusNothing; 1357 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1453 input_style = XIMPreeditNothing | XIMStatusNothing; 1369 input_style = XIMPreeditNothing | XIMStatusNothing;
1454 1370
1455 for (j = 0; j < xim_styles->count_styles; j++) 1371 for (j = 0; j < xim_styles->count_styles; j++)
1456 if (input_style == xim_styles->supported_styles[j]) 1372 if (input_style == xim_styles->supported_styles[j])
1457 { 1373 {
1458 rxvt_freecommastring (s); 1374 rxvt_free_strsplit (s);
1459 1375
1460 found = 1; 1376 found = 1;
1461 goto foundpet; 1377 goto foundpet;
1462 } 1378 }
1463 1379
1464 } 1380 }
1465 1381
1466 rxvt_freecommastring (s); 1382 rxvt_free_strsplit (s);
1467 } 1383 }
1468 1384
1469foundpet: 1385foundpet:
1470 1386
1471 XFree (xim_styles); 1387 XFree (xim_styles);
… …
1627 p = rs[Rs_inputMethod]; 1543 p = rs[Rs_inputMethod];
1628 if (p && *p) 1544 if (p && *p)
1629 { 1545 {
1630 bool found = false; 1546 bool found = false;
1631 1547
1632 s = rxvt_splitcommastring (p); 1548 s = rxvt_strsplit (',', p);
1633 1549
1634 for (i = 0; s[i]; i++) 1550 for (i = 0; s[i]; i++)
1635 { 1551 {
1636 if (*s[i]) 1552 if (*s[i])
1637 { 1553 {
… …
1643 break; 1559 break;
1644 } 1560 }
1645 } 1561 }
1646 } 1562 }
1647 1563
1648 rxvt_freecommastring (s); 1564 rxvt_free_strsplit (s);
1649 1565
1650 if (found) 1566 if (found)
1651 goto done; 1567 goto done;
1652 } 1568 }
1653 1569
… …
1714void 1630void
1715rxvt_term::get_window_origin (int &x, int &y) 1631rxvt_term::get_window_origin (int &x, int &y)
1716{ 1632{
1717 Window cr; 1633 Window cr;
1718 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1720} 1635}
1721 1636
1722Pixmap 1637Pixmap
1723rxvt_term::get_pixmap_property (int prop_id) 1638rxvt_term::get_pixmap_property (Atom property)
1724{ 1639{
1725 if (prop_id > 0 && prop_id < NUM_XA) 1640 Pixmap pixmap = None;
1726 if (xa[prop_id]) 1641
1727 {
1728 int aformat; 1642 int aformat;
1729 unsigned long nitems, bytes_after; 1643 unsigned long nitems, bytes_after;
1730 Atom atype; 1644 Atom atype;
1731 unsigned char *prop = NULL; 1645 unsigned char *prop;
1732 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1646 int result = XGetWindowProperty (dpy, display->root, property,
1733 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1647 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734 &nitems, &bytes_after, &prop); 1648 &nitems, &bytes_after, &prop);
1735 if (result == Success && prop && atype == XA_PIXMAP) 1649 if (result == Success)
1736 { 1650 {
1737 return *(Pixmap *)prop; 1651 if (atype == XA_PIXMAP)
1738 } 1652 pixmap = *(Pixmap *)prop;
1653 XFree (prop);
1739 } 1654 }
1740 return None; 1655
1656 return pixmap;
1741} 1657}
1742 1658
1743#ifdef HAVE_BG_PIXMAP 1659#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS 1660
1745# undef update_background 1661void
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1752int
1753rxvt_term::update_background () 1662rxvt_term::update_background ()
1754{ 1663{
1664 if (update_background_ev.is_active ())
1665 return;
1666
1755 bgPixmap.invalidate (); 1667 bgPixmap.invalidate ();
1756 1668
1757 /* no chance of real time refresh if we are blurring! */ 1669 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1670
1671 if (to_wait <= 0.)
1759 bgPixmap.render (); 1672 bgPixmap.render ();
1760 else 1673 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering())
1765 update_background_ev.start (.05); 1674 update_background_ev.start (to_wait);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773} 1675}
1774 1676
1775void 1677void
1776rxvt_term::update_background_cb (ev::timer &w, int revents) 1678rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{ 1679{
1680 make_current ();
1681
1682 update_background_ev.stop ();
1778 bgPixmap.render (); 1683 bgPixmap.render ();
1684 refresh_check ();
1779} 1685}
1780 1686
1781#endif /* HAVE_BG_PIXMAP */ 1687#endif /* HAVE_BG_PIXMAP */
1782 1688
1783/*----------------------- end-of-file (C source) -----------------------*/ 1689/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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