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.258 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.352 by sf-exg, Fri Feb 11 01:24:46 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 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 194
198 incr_ev (this, &rxvt_term::incr_cb)
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 196
202 termlist.push_back (this); 197 termlist.push_back (this);
203 198
204#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
230 delete fontset[i]; 225 delete fontset[i];
231#endif 226#endif
232 delete fontset[0]; 227 delete fontset[0];
233 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
234 if (display) 233 if (display)
235 { 234 {
236 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
237 237
238#ifdef USE_XIM 238#ifdef USE_XIM
239 im_destroy (); 239 im_destroy ();
240#endif 240#endif
241#ifdef XTERM_SCROLLBAR 241 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); 242 if (gc) XFreeGC (dpy, gc);
266 243
267 delete drawable; 244 delete drawable;
268 // destroy all windows 245 // destroy all windows
269 if (parent[0]) 246 if (parent[0])
… …
277 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
278#endif 255#endif
279 } 256 }
280 257
281 clear (); 258 clear ();
282 }
283 259
284 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 displays.put (display); 261 displays.put (display);
262 }
290 263
291 scr_release (); 264 scr_release ();
292 265
293 /* clear all resources */ 266 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
295 free (allocated [i]); 268 free (allocated [i]);
296 269
297 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
298 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
299 free (env_display); 273 free (env_display);
300 free (env_term); 274 free (env_term);
301 free (locale); 275 free (locale);
302 free (v_buffer); 276 free (v_buffer);
303 free (incr_buf);
304 277
305 delete envv; 278 delete envv;
306 delete argv; 279 delete argv;
307 280
308#ifdef KEYSYM_RESOURCE 281#ifdef KEYSYM_RESOURCE
309 delete keyboard; 282 delete keyboard;
310#endif 283#endif
284#ifndef NO_RESOURCES
285 XrmDestroyDatabase (option_db);
286#endif
311} 287}
312 288
313// child has exited, usually destroys 289// child has exited, usually destroys
314void 290void
315rxvt_term::child_cb (ev::child &w, int status) 291rxvt_term::child_cb (ev::child &w, int status)
… …
323} 299}
324 300
325void 301void
326rxvt_term::destroy () 302rxvt_term::destroy ()
327{ 303{
328 if (destroy_ev.active) 304 if (destroy_ev.is_active ())
329 return; 305 return;
330 306
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 307 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 308
333#if ENABLE_OVERLAY 309#if ENABLE_OVERLAY
… …
337 if (display) 313 if (display)
338 { 314 {
339#if USE_XIM 315#if USE_XIM
340 im_ev.stop (display); 316 im_ev.stop (display);
341#endif 317#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 318 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 319#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 320 rootwin_ev.stop (display);
347#endif 321#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 322 termwin_ev.stop (display);
350 vt_ev.stop (display); 323 vt_ev.stop (display);
351 } 324 }
352 325
353 prepare_ev.stop (); 326 flush_ev.stop ();
354 pty_ev.stop (); 327 pty_ev.stop ();
355#ifdef CURSOR_BLINK 328#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 329 cursor_blink_ev.stop ();
357#endif 330#endif
358#ifdef TEXT_BLINK 331#ifdef TEXT_BLINK
… …
370 343
371 destroy_ev.start (); 344 destroy_ev.start ();
372} 345}
373 346
374void 347void
375rxvt_term::destroy_cb (ev::check &w, int revents) 348rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 349{
377 make_current (); 350 make_current ();
378 351
379 delete this; 352 delete this;
353}
354
355void
356rxvt_term::set_option (uint8_t opt, bool set)
357{
358 if (!opt)
359 return;
360
361 uint8_t mask = 1 << (opt & 7);
362 uint8_t &val = options [opt >> 3];
363
364 val = val & ~mask | (set ? mask : 0);
380} 365}
381 366
382/*----------------------------------------------------------------------*/ 367/*----------------------------------------------------------------------*/
383/* 368/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 369 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
398print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
399{ 384{
400 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
402 char number[32]; 387 char number[32];
403 char *mtype = "XlibMessage"; 388 const char mtype[] = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 389 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 391 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 393 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 394 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 395 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 396 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 397 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 398 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 400 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 401 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 402 }
418 if ((event->error_code == BadWindow) || 403 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 404 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 405 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 406 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 407 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 408 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 409 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 410 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 411 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 412 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 413 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 415 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 418 mesg, BUFSIZ);
434 else 419 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 421 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 423 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 425 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 427}
443#endif 428#endif
444 429
445int 430int
… …
468 DisplayString (display)); 453 DisplayString (display));
469 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
471} 456}
472 457
473/*----------------------------------------------------------------------*/
474bool
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 if (!init_vars ())
484 return false;
485
486 init_secondary ();
487
488 const char **cmd_argv = init_resources (argc, argv);
489
490#ifdef KEYSYM_RESOURCE
491 keyboard->register_done ();
492#endif
493
494#ifdef HAVE_SCROLLBARS
495 if (option (Opt_scrollBar))
496 scrollBar.setIdle (); /* set existence for size calculations */
497#endif
498
499 pty = ptytty::create ();
500
501 create_windows (argc, argv);
502
503 init_xlocale ();
504
505 scr_reset (); // initialize screen
506
507#if 0
508 XSynchronize (dpy, True);
509#endif
510
511#ifdef HAVE_SCROLLBARS
512 if (option (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */
514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 prepare_ev.start ();
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 return true;
590}
591
592static struct sig_handlers 458static struct sig_handlers
593{ 459{
594 ev::sig sw_term, sw_int; 460 ev::sig sw_term, sw_int;
595 461
596 /* 462 /*
597 * Catch a fatal signal and tidy up before quitting 463 * Catch a fatal signal and tidy up before quitting
598 */ 464 */
599 void
600 sig_term (ev::sig &w, int revents) 465 void sig_term (ev::sig &w, int revents);
466
467 sig_handlers ()
601 { 468 {
602 rxvt_emergency_cleanup (); 469 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 w.stop ();
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 470 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 471 }
612} sig_handlers; 472} sig_handlers;
613 473
474void
475sig_handlers::sig_term (ev::sig &w, int revents)
476{
477 rxvt_emergency_cleanup ();
478 w.stop ();
479 kill (getpid (), w.signum);
480}
481
482static void
483rxvt_get_ttymode (struct termios *tio)
484{
485 if (tcgetattr (STDIN_FILENO, tio) < 0)
486 memset (tio, 0, sizeof (struct termios));
487
488 for (int i = 0; i < NCCS; i++)
489 tio->c_cc[i] = VDISABLE;
490
491 tio->c_cc[VINTR] = CINTR;
492 tio->c_cc[VQUIT] = CQUIT;
493 tio->c_cc[VERASE] = CERASE;
494#ifdef VERASE2
495 tio->c_cc[VERASE2] = CERASE2;
496#endif
497 tio->c_cc[VKILL] = CKILL;
498 tio->c_cc[VEOF] = CEOF;
499 tio->c_cc[VSTART] = CSTART;
500 tio->c_cc[VSTOP] = CSTOP;
501 tio->c_cc[VSUSP] = CSUSP;
502# ifdef VDSUSP
503 tio->c_cc[VDSUSP] = CDSUSP;
504# endif
505# ifdef VREPRINT
506 tio->c_cc[VREPRINT] = CRPRNT;
507# endif
508# ifdef VDISCRD
509 tio->c_cc[VDISCRD] = CFLUSH;
510# endif
511# ifdef VWERSE
512 tio->c_cc[VWERSE] = CWERASE;
513# endif
514# ifdef VLNEXT
515 tio->c_cc[VLNEXT] = CLNEXT;
516# endif
517# ifdef VSTATUS
518 tio->c_cc[VSTATUS] = CSTATUS;
519# endif
520
521# if VMIN != VEOF
522 tio->c_cc[VMIN] = 1;
523# endif
524# if VTIME != VEOL
525 tio->c_cc[VTIME] = 0;
526# endif
527
528 /* input modes */
529 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
530# ifdef IMAXBEL
531 | IMAXBEL
532# endif
533 | IXON);
534
535 /* output modes */
536 tio->c_oflag = (OPOST | ONLCR);
537
538 /* control modes */
539 tio->c_cflag = (CS8 | CREAD);
540
541 /* local modes */
542 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
543# if defined (ECHOCTL) && defined (ECHOKE)
544 | ECHOCTL | ECHOKE
545# endif
546 | ECHOE | ECHOK);
547}
548
614char **rxvt_environ; // startup environment 549char **rxvt_environ; // startup environment
615 550
616void 551void
617rxvt_init () 552rxvt_init ()
618{ 553{
619 ptytty::init (); 554 assert (("fontMask must not overlap other RS masks",
555 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
620 556
557 rxvt_get_ttymode (&rxvt_term::def_tio);
558
559 // get rid of stdin/stdout as we don't need them, to free resources
560 dup2 (STDERR_FILENO, STDIN_FILENO);
561 dup2 (STDERR_FILENO, STDOUT_FILENO);
562
621 if (!ev::ev_default_loop (0)) 563 if (!ev_default_loop ())
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 564 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 565
624 rxvt_environ = environ; 566 rxvt_environ = environ;
625 567
626 signal (SIGHUP, SIG_IGN); 568 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 569 signal (SIGPIPE, SIG_IGN);
628 570
629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 571 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 572 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */
634 573
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
637 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
638 577
639 XrmInitialize (); 578 XrmInitialize ();
640}
641
642/* ------------------------------------------------------------------------- *
643 * MEMORY ALLOCATION WRAPPERS *
644 * ------------------------------------------------------------------------- */
645void *
646rxvt_malloc (size_t size)
647{
648 void *p = malloc (size);
649
650 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n");
652
653 return p;
654}
655
656void *
657rxvt_calloc (size_t number, size_t size)
658{
659 void *p = calloc (number, size);
660
661 if (!p)
662 rxvt_fatal ("memory allocation failure. aborting.\n");
663
664 return p;
665}
666
667void *
668rxvt_realloc (void *ptr, size_t size)
669{
670 void *p = realloc (ptr, size);
671
672 if (!p)
673 rxvt_fatal ("memory allocation failure. aborting.\n");
674
675 return p;
676} 579}
677 580
678/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
679/* 582/*
680 * window size/position calculations for XSizeHint and other storage. 583 * window size/position calculations for XSizeHint and other storage.
… …
682 */ 585 */
683void 586void
684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 587rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
685{ 588{
686 short recalc_x, recalc_y; 589 short recalc_x, recalc_y;
687 int x, y, sb_w, flags; 590 int x, y, flags;
688 unsigned int w, h; 591 unsigned int w, h;
689 unsigned int max_width, max_height; 592 unsigned int max_width, max_height;
690 593
691 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 594 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
692 szHint.win_gravity = NorthWestGravity; 595 szHint.win_gravity = NorthWestGravity;
… …
702 if (rs[Rs_geometry]) 605 if (rs[Rs_geometry])
703 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 606 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
704 607
705 if (flags & WidthValue) 608 if (flags & WidthValue)
706 { 609 {
610 if (!w)
611 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
612
707 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 613 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
708 szHint.flags |= USSize; 614 szHint.flags |= USSize;
709 } 615 }
710 616
711 if (flags & HeightValue) 617 if (flags & HeightValue)
712 { 618 {
619 if (!h)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
713 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 622 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 623 szHint.flags |= USSize;
715 } 624 }
716 625
717 if (flags & XValue) 626 if (flags & XValue)
718 { 627 {
… …
749 max_width = MAX_COLS * fwidth; 658 max_width = MAX_COLS * fwidth;
750 max_height = MAX_ROWS * fheight; 659 max_height = MAX_ROWS * fheight;
751 660
752 szHint.base_width = szHint.base_height = 2 * int_bwidth; 661 szHint.base_width = szHint.base_height = 2 * int_bwidth;
753 662
754 sb_w = 0;
755 window_vt_x = window_vt_y = int_bwidth; 663 window_vt_x = window_vt_y = int_bwidth;
756 664
757 if (scrollBar.state) 665 if (scrollBar.state)
758 { 666 {
759 sb_w = scrollbar_TotalWidth (); 667 int sb_w = scrollBar.total_width ();
760 szHint.base_width += sb_w; 668 szHint.base_width += sb_w;
761 669
762 if (!option (Opt_scrollBar_right)) 670 if (!option (Opt_scrollBar_right))
763 window_vt_x += sb_w; 671 window_vt_x += sb_w;
764 } 672 }
… …
788 { 696 {
789 min_it (height, max_height); 697 min_it (height, max_height);
790 szHint.height = szHint.base_height + height; 698 szHint.height = szHint.base_height + height;
791 } 699 }
792 700
793 if (scrollBar.state && option (Opt_scrollBar_right))
794 window_sb_x = szHint.width - sb_w;
795
796 if (recalc_x) 701 if (recalc_x)
797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 702 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798 703
799 if (recalc_y) 704 if (recalc_y)
800 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 705 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
801 706
802 ncol = width / fwidth; 707 ncol = width / fwidth;
803 nrow = height / fheight; 708 nrow = height / fheight;
804} 709}
805 710
806/*----------------------------------------------------------------------*/ 711/*----------------------------------------------------------------------*/
807/* 712/*
… …
818 723
819 ws.ws_col = ncol; 724 ws.ws_col = ncol;
820 ws.ws_row = nrow; 725 ws.ws_row = nrow;
821 ws.ws_xpixel = width; 726 ws.ws_xpixel = width;
822 ws.ws_ypixel = height; 727 ws.ws_ypixel = height;
823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 728 ioctl (pty->pty, TIOCSWINSZ, &ws);
824 729
825#if 0 730#if 0
826 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 731 // TIOCSWINSZ is supposed to do this automatically and correctly
827 if (cmd_pid) /* force through to the command */ 732 if (cmd_pid) /* force through to the command */
828 kill (-cmd_pid, SIGWINCH); 733 kill (-cmd_pid, SIGWINCH);
829#endif 734#endif
830} 735}
831 736
… …
858#endif 763#endif
859 764
860 delete fontset[0]; 765 delete fontset[0];
861 fontset[0] = fs; 766 fontset[0] = fs;
862 767
863 prop = (*fs)[1]->properties (); 768 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
864 prop.height += lineSpace; 769 prop.height += lineSpace;
770 prop.width += letterSpace;
865 771
866 fs->set_prop (prop, false); 772 fs->set_prop (prop, false);
867 773
868 fwidth = prop.width; 774 fwidth = prop.width;
869 fheight = prop.height; 775 fheight = prop.height;
… …
919 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
920 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
921} 827}
922 828
923void 829void
830rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
831{
832 XTextProperty ct;
833
834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
835 {
836 XSetTextProperty (dpy, parent[0], &ct, prop);
837 XFree (ct.value);
838 }
839}
840
841void
924rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
925{ 843{
926 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
927 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
928 846
… …
938/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
939/* xterm sequences - title, iconName, color (exptl) */ 857/* xterm sequences - title, iconName, color (exptl) */
940void 858void
941rxvt_term::set_title (const char *str) 859rxvt_term::set_title (const char *str)
942{ 860{
943 set_string_property (XA_WM_NAME, str); 861 set_mbstring_property (XA_WM_NAME, str);
944#if ENABLE_EWMH 862#if ENABLE_EWMH
945 set_utf8_property (xa[XA_NET_WM_NAME], str); 863 set_utf8_property (xa[XA_NET_WM_NAME], str);
946#endif 864#endif
947} 865}
948 866
949void 867void
950rxvt_term::set_icon_name (const char *str) 868rxvt_term::set_icon_name (const char *str)
951{ 869{
952 set_string_property (XA_WM_ICON_NAME, str); 870 set_mbstring_property (XA_WM_ICON_NAME, str);
953#if ENABLE_EWMH 871#if ENABLE_EWMH
954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
955#endif 873#endif
956} 874}
957 875
958void 876void
959rxvt_term::set_window_color (int idx, const char *color) 877rxvt_term::set_window_color (int idx, const char *color)
960{ 878{
961#ifdef XTERM_COLOR_CHANGE 879#ifdef XTERM_COLOR_CHANGE
962 rxvt_color xcol; 880 rxvt_color xcol;
963 int i;
964 881
965 if (color == NULL || *color == '\0') 882 if (color == NULL || *color == '\0')
966 return; 883 return;
967 884
968 color = strdup (color); 885 color = strdup (color);
… …
970 rs[Rs_color + idx] = color; 887 rs[Rs_color + idx] = color;
971 888
972 /* handle color aliases */ 889 /* handle color aliases */
973 if (isdigit (*color)) 890 if (isdigit (*color))
974 { 891 {
975 i = atoi (color); 892 int i = atoi (color);
976 893
977 if (i >= 8 && i <= 15) 894 if (i >= 8 && i <= 15)
895 {
978 { /* bright colors */ 896 /* bright colors */
979 i -= 8;
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 897 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
981 goto done; 898 goto done;
982 } 899 }
983 900
984 if (i >= 0 && i <= 7) 901 if (i >= 0 && i <= 7)
902 {
985 { /* normal colors */ 903 /* normal colors */
986 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
987 goto done; 905 goto done;
988 } 906 }
989 } 907 }
990 908
… …
995 * so just keep gobbling up the colormap 913 * so just keep gobbling up the colormap
996 */ 914 */
997 915
998 pix_colors_focused[idx] = xcol; 916 pix_colors_focused[idx] = xcol;
999 917
1000 /* XSetWindowAttributes attr; */
1001 /* Cursor cursor; */
1002done: 918done:
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 919 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 920
1005 update_fade_color (idx); 921 update_fade_color (idx);
1006 recolour_cursor (); 922 recolour_cursor ();
… …
1030 */ 946 */
1031void 947void
1032rxvt_term::set_colorfgbg () 948rxvt_term::set_colorfgbg ()
1033{ 949{
1034 unsigned int i; 950 unsigned int i;
1035 const char *xpmb = "\0"; 951 const char *xpmb = "";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
1037 954
1038 strcpy (fstr, "default");
1039 strcpy (bstr, "default");
1040 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
1041 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
1042 { 957 {
1043 sprintf (fstr, "%d", (i - Color_Black)); 958 sprintf (fstr, "%d", i - Color_Black);
1044 break; 959 break;
1045 } 960 }
1046 961
1047 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
1048 if (pix_colors[Color_bg] == pix_colors[i]) 963 if (pix_colors[Color_bg] == pix_colors[i])
1049 { 964 {
1050 sprintf (bstr, "%d", (i - Color_Black)); 965 sprintf (bstr, "%d", i - Color_Black);
1051#ifdef BG_IMAGE_FROM_FILE 966#ifdef BG_IMAGE_FROM_FILE
1052 xpmb = "default;"; 967 xpmb = "default;";
1053#endif 968#endif
1054 break; 969 break;
1055 } 970 }
… …
1085 int old_width = szHint.width; 1000 int old_width = szHint.width;
1086 int old_height = szHint.height; 1001 int old_height = szHint.height;
1087 1002
1088 window_calc (newwidth, newheight); 1003 window_calc (newwidth, newheight);
1089 1004
1090 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1005 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1006
1007 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1008 if (set_hint)
1009 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc);
1091 XSetWMNormalHints (dpy, parent[0], &szHint); 1011 XSetWMNormalHints (dpy, parent[0], &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc;
1013 }
1092 1014
1093 if (!ignoreparent) 1015 if (!ignoreparent)
1094 { 1016 {
1095#ifdef SMART_RESIZE 1017#ifdef SMART_RESIZE
1096 /* 1018 /*
… …
1136#else 1058#else
1137 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1138#endif 1060#endif
1139 } 1061 }
1140 1062
1063 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint);
1065
1141 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1142 1067
1143 if (fix_screen || newwidth != old_width || newheight != old_height) 1068 if (fix_screen || newwidth != old_width || newheight != old_height)
1144 { 1069 {
1145 if (scrollBar.state) 1070 if (scrollBar.state)
1146 { 1071 scrollBar.resize ();
1147 XMoveResizeWindow (dpy, scrollBar.win,
1148 window_sb_x, 0,
1149 scrollbar_TotalWidth (), szHint.height);
1150 resize_scrollbar ();
1151 }
1152 1072
1153 XMoveResizeWindow (dpy, vt, 1073 XMoveResizeWindow (dpy, vt,
1154 window_vt_x, window_vt_y, 1074 window_vt_x, window_vt_y,
1155 width, height); 1075 width, height);
1156 1076
1157#ifdef HAVE_BG_PIXMAP 1077#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ()) 1078 if (bg_window_size_sensitive ())
1159 update_background (); 1079 update_background ();
1160#endif 1080#endif
1161
1162 scr_clear ();
1163 } 1081 }
1164 1082
1165 if (fix_screen || old_height == 0) 1083 if (fix_screen || old_height == 0)
1166 scr_reset (); 1084 scr_reset ();
1167
1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1169 //scr_touch (false);
1170
1171#ifdef HAVE_BG_PIXMAP
1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173// if (bgPixmap.pixmap)
1174// scr_touch (false);
1175#endif
1176 1085
1177#ifdef USE_XIM 1086#ifdef USE_XIM
1178 IMSetPosition (); 1087 IMSetPosition ();
1179#endif 1088#endif
1180} 1089}
… …
1246 1155
1247/* Checking whether input method is running. */ 1156/* Checking whether input method is running. */
1248bool 1157bool
1249rxvt_term::IMisRunning () 1158rxvt_term::IMisRunning ()
1250{ 1159{
1251 char *p;
1252 Atom atom; 1160 Atom atom;
1253 Window win; 1161 Window win;
1254 char server[IMBUFSIZ]; 1162 char server[IMBUFSIZ];
1255 1163
1256 /* get current locale modifier */ 1164 /* get current locale modifier */
1257 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1165 if (char *p = XSetLocaleModifiers (0))
1258 { 1166 {
1259 strcpy (server, "@server="); 1167 strcpy (server, "@server=");
1260 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1168 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1261 1169
1262 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1170 if (p = strchr (server + 1, '@')) /* first one only */
1263 *p = '\0'; 1171 *p = '\0';
1264 1172
1265 atom = XInternAtom (dpy, server, False); 1173 atom = XInternAtom (dpy, server, False);
1266 win = XGetSelectionOwner (dpy, atom); 1174 win = XGetSelectionOwner (dpy, atom);
1267 1175
1268 if (win != None) 1176 if (win != None)
1269 return True; 1177 return true;
1270 } 1178 }
1271 1179
1272 return False; 1180 return false;
1273} 1181}
1274 1182
1275void 1183void
1276rxvt_term::IMSendSpot () 1184rxvt_term::IMSendSpot ()
1277{ 1185{
… …
1334 1242
1335 term->make_current (); 1243 term->make_current ();
1336 1244
1337 if (text) 1245 if (text)
1338 { 1246 {
1339 void *str; 1247 wchar_t *str;
1340 1248
1341 if (!text->encoding_is_wchar && text->string.multi_byte) 1249 if (!text->encoding_is_wchar && text->string.multi_byte)
1342 { 1250 {
1343 // of course, X makes it ugly again 1251 // of course, X makes it ugly again
1344 if (term->rs[Rs_imLocale]) 1252 if (term->rs[Rs_imLocale])
1345 SET_LOCALE (term->rs[Rs_imLocale]); 1253 SET_LOCALE (term->rs[Rs_imLocale]);
1346 1254
1347 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1255 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1348 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1256 mbstowcs (str, text->string.multi_byte, text->length + 1);
1349 1257
1350 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->locale); 1259 SET_LOCALE (term->locale);
1352 } 1260 }
1353 else 1261 else
1354 str = (void *)text->string.wide_char; 1262 str = text->string.wide_char;
1355 1263
1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1264 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1357 DT_INT, call_data->caret, 1265 DT_INT, call_data->caret,
1358 DT_INT, call_data->chg_first, 1266 DT_INT, call_data->chg_first,
1359 DT_INT, call_data->chg_length, 1267 DT_INT, call_data->chg_length,
… …
1430 p = pet[pi]; 1338 p = pet[pi];
1431 1339
1432 if (!p) 1340 if (!p)
1433 continue; 1341 continue;
1434 1342
1435 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1436 1344
1437 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1438 { 1346 {
1439 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1440 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1452 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1453 1361
1454 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1455 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1456 { 1364 {
1457 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1458 1366
1459 found = 1; 1367 found = 1;
1460 goto foundpet; 1368 goto foundpet;
1461 } 1369 }
1462 1370
1463 } 1371 }
1464 1372
1465 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1466 } 1374 }
1467 1375
1468foundpet: 1376foundpet:
1469 1377
1470 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1626 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1627 if (p && *p) 1535 if (p && *p)
1628 { 1536 {
1629 bool found = false; 1537 bool found = false;
1630 1538
1631 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1632 1540
1633 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1634 { 1542 {
1635 if (*s[i]) 1543 if (*s[i])
1636 { 1544 {
… …
1642 break; 1550 break;
1643 } 1551 }
1644 } 1552 }
1645 } 1553 }
1646 1554
1647 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1648 1556
1649 if (found) 1557 if (found)
1650 goto done; 1558 goto done;
1651 } 1559 }
1652 1560
… …
1713void 1621void
1714rxvt_term::get_window_origin (int &x, int &y) 1622rxvt_term::get_window_origin (int &x, int &y)
1715{ 1623{
1716 Window cr; 1624 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1625 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719} 1626}
1720 1627
1721Pixmap 1628Pixmap
1722rxvt_term::get_pixmap_property (int prop_id) 1629rxvt_term::get_pixmap_property (Atom property)
1723{ 1630{
1724 if (prop_id > 0 && prop_id < NUM_XA) 1631 Pixmap pixmap = None;
1725 if (xa[prop_id]) 1632
1726 {
1727 int aformat; 1633 int aformat;
1728 unsigned long nitems, bytes_after; 1634 unsigned long nitems, bytes_after;
1729 Atom atype; 1635 Atom atype;
1730 unsigned char *prop = NULL; 1636 unsigned char *prop;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1637 int result = XGetWindowProperty (dpy, display->root, property,
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1638 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop); 1639 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP) 1640 if (result == Success)
1735 { 1641 {
1736 return *(Pixmap *)prop; 1642 if (atype == XA_PIXMAP)
1737 } 1643 pixmap = *(Pixmap *)prop;
1644 XFree (prop);
1738 } 1645 }
1739 return None; 1646
1647 return pixmap;
1740} 1648}
1741 1649
1742#ifdef HAVE_BG_PIXMAP 1650#ifdef HAVE_BG_PIXMAP
1743int 1651
1652void
1744rxvt_term::update_background () 1653rxvt_term::update_background ()
1745{ 1654{
1655 if (update_background_ev.is_active ())
1656 return;
1657
1746 bgPixmap.invalidate (); 1658 bg_invalidate ();
1747 1659
1748 /* no chance of real time refresh if we are blurring! */ 1660 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1749 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1661
1662 if (to_wait <= 0.)
1750 bgPixmap.render (); 1663 bg_render ();
1751 else 1664 else
1752 {
1753 update_background_ev.stop ();
1754
1755 if (!bgPixmap.need_client_side_rendering())
1756 update_background_ev.start (.05); 1665 update_background_ev.start (to_wait);
1757 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1758 update_background_ev.start (.20); /* very slow !!! */
1759 else
1760 update_background_ev.start (.07);
1761 }
1762
1763 return 0;
1764} 1666}
1765 1667
1766void 1668void
1767rxvt_term::update_background_cb (ev::timer &w, int revents) 1669rxvt_term::update_background_cb (ev::timer &w, int revents)
1768{ 1670{
1671 make_current ();
1672
1673 update_background_ev.stop ();
1769 bgPixmap.render (); 1674 bg_render ();
1675 refresh_check ();
1770} 1676}
1771 1677
1772#endif /* HAVE_BG_PIXMAP */ 1678#endif /* HAVE_BG_PIXMAP */
1773 1679
1774/*----------------------- end-of-file (C source) -----------------------*/ 1680/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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