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.254 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 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 <schmorp@schmorp.de>
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
… …
93class rxvt_composite_vec rxvt_composite; 94class rxvt_composite_vec rxvt_composite;
94 95
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 184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#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 check_ev (this, &rxvt_term::check_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)
270 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
271 248
272 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
274 { 251 {
275 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
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); 277
278 delete selection_req;
304 279
305 delete envv; 280 delete envv;
306 delete argv; 281 delete argv;
307 282
308#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
309 delete keyboard; 284 delete keyboard;
310#endif 285#endif
286#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db);
288#endif
311} 289}
312 290
313// child has exited, usually destroys 291// child has exited, usually destroys
314void 292void
315rxvt_term::child_cb (child_watcher &w, int status) 293rxvt_term::child_cb (ev::child &w, int status)
316{ 294{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318 296
319 cmd_pid = 0; 297 cmd_pid = 0;
320 298
… …
323} 301}
324 302
325void 303void
326rxvt_term::destroy () 304rxvt_term::destroy ()
327{ 305{
328 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
329 return; 307 return;
330 308
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 310
333#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
… …
337 if (display) 315 if (display)
338 { 316 {
339#if USE_XIM 317#if USE_XIM
340 im_ev.stop (display); 318 im_ev.stop (display);
341#endif 319#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
347#endif 323#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 324 termwin_ev.stop (display);
350 vt_ev.stop (display); 325 vt_ev.stop (display);
351 } 326 }
352 327
353 check_ev.stop (); 328 flush_ev.stop ();
354 pty_ev.stop (); 329 pty_ev.stop ();
355#ifdef CURSOR_BLINK 330#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 331 cursor_blink_ev.stop ();
357#endif 332#endif
358#ifdef TEXT_BLINK 333#ifdef TEXT_BLINK
… …
366#endif 341#endif
367#ifdef POINTER_BLANK 342#ifdef POINTER_BLANK
368 pointer_ev.stop (); 343 pointer_ev.stop ();
369#endif 344#endif
370 345
371 destroy_ev.start (0); 346 destroy_ev.start ();
372} 347}
373 348
374void 349void
375rxvt_term::destroy_cb (time_watcher &w) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 351{
377 make_current (); 352 make_current ();
378 353
379 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
380} 367}
381 368
382/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
383/* 370/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
398print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
399{ 386{
400 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
402 char number[32]; 389 char number[32];
403 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 402 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 404 }
418 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 417 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 420 mesg, BUFSIZ);
434 else 421 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 423 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 425 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 427 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 429}
443#endif 430#endif
444 431
445int 432int
… …
468 DisplayString (display)); 455 DisplayString (display));
469 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
471} 458}
472 459
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, EVENT_READ);
571
572 check_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 460static struct sig_handlers
593{ 461{
594 sig_watcher sw_term, sw_int; 462 ev::sig sw_term, sw_int;
595 463
596 /* 464 /*
597 * Catch a fatal signal and tidy up before quitting 465 * Catch a fatal signal and tidy up before quitting
598 */ 466 */
599 void 467 void sig_term (ev::sig &w, int revents);
600 sig_term (sig_watcher &w) 468
469 sig_handlers ()
601 { 470 {
602 rxvt_emergency_cleanup (); 471 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 signal (w.signum, SIG_DFL);
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) 472 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 473 }
612} sig_handlers; 474} sig_handlers;
613 475
476void
477sig_handlers::sig_term (ev::sig &w, int revents)
478{
479 rxvt_emergency_cleanup ();
480 w.stop ();
481 kill (getpid (), w.signum);
482}
483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
614char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
615 552
616void 553void
617rxvt_init () 554rxvt_init ()
618{ 555{
619 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
565 if (!ev_default_loop ())
566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620 567
621 rxvt_environ = environ; 568 rxvt_environ = environ;
622 569
623 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
624 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
625 572
626 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
628
629 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
630 /* signal (SIGURG, SIG_DFL); */
631 575
632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
633 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
634 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
635 579
636 XrmInitialize (); 580 XrmInitialize ();
637}
638
639/* ------------------------------------------------------------------------- *
640 * MEMORY ALLOCATION WRAPPERS *
641 * ------------------------------------------------------------------------- */
642void *
643rxvt_malloc (size_t size)
644{
645 void *p = malloc (size);
646
647 if (!p)
648 rxvt_fatal ("memory allocation failure. aborting.\n");
649
650 return p;
651}
652
653void *
654rxvt_calloc (size_t number, size_t size)
655{
656 void *p = calloc (number, size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_realloc (void *ptr, size_t size)
666{
667 void *p = realloc (ptr, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673} 581}
674 582
675/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
676/* 584/*
677 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
679 */ 587 */
680void 588void
681rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
682{ 590{
683 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
684 int x, y, sb_w, flags; 592 int x, y, flags;
685 unsigned int w, h; 593 unsigned int w, h;
686 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
687 595
688 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
689 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
699 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
700 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
701 609
702 if (flags & WidthValue) 610 if (flags & WidthValue)
703 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
704 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
705 szHint.flags |= USSize; 616 szHint.flags |= USSize;
706 } 617 }
707 618
708 if (flags & HeightValue) 619 if (flags & HeightValue)
709 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
710 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 625 szHint.flags |= USSize;
712 } 626 }
713 627
714 if (flags & XValue) 628 if (flags & XValue)
715 { 629 {
… …
746 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
747 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
748 662
749 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
750 664
751 sb_w = 0;
752 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
753 666
754 if (scrollBar.state) 667 if (scrollBar.state)
755 { 668 {
756 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
757 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
758 671
759 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
760 window_vt_x += sb_w; 673 window_vt_x += sb_w;
761 } 674 }
… …
785 { 698 {
786 min_it (height, max_height); 699 min_it (height, max_height);
787 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
788 } 701 }
789 702
790 if (scrollBar.state && option (Opt_scrollBar_right))
791 window_sb_x = szHint.width - sb_w;
792
793 if (recalc_x) 703 if (recalc_x)
794 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
795 705
796 if (recalc_y) 706 if (recalc_y)
797 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
798 708
799 ncol = width / fwidth; 709 ncol = width / fwidth;
800 nrow = height / fheight; 710 nrow = height / fheight;
801} 711}
802 712
803/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
804/* 714/*
… …
815 725
816 ws.ws_col = ncol; 726 ws.ws_col = ncol;
817 ws.ws_row = nrow; 727 ws.ws_row = nrow;
818 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
819 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
820 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
821 731
822#if 0 732#if 0
823 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
824 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
825 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
826#endif 736#endif
827} 737}
828 738
… …
855#endif 765#endif
856 766
857 delete fontset[0]; 767 delete fontset[0];
858 fontset[0] = fs; 768 fontset[0] = fs;
859 769
860 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
861 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
862 773
863 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
864 775
865 fwidth = prop.width; 776 fwidth = prop.width;
866 fheight = prop.height; 777 fheight = prop.height;
… …
897#else 808#else
898 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
899#endif 810#endif
900 } 811 }
901 812
902 if (parent[0]) 813 if (parent)
903 { 814 {
904 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
905 scr_remap_chars (); 816 scr_remap_chars ();
906 scr_touch (true); 817 scr_touch (true);
907 } 818 }
908 819
909 return true; 820 return true;
910} 821}
911 822
912void 823void
913rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
914{ 825{
915 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
916 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
917 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
918} 829}
919 830
920void 831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 {
838 XSetTextProperty (dpy, parent, &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
921rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
922{ 845{
923 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
924 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
925 848
926 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
927 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
928 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
929 852
930 free (s); 853 free (s);
931 free (ws); 854 free (ws);
… …
935/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
936/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
937void 860void
938rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
939{ 862{
940 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
941#if ENABLE_EWMH 864#if ENABLE_EWMH
942 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
943#endif 866#endif
944} 867}
945 868
946void 869void
947rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
948{ 871{
949 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
950#if ENABLE_EWMH 873#if ENABLE_EWMH
951 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
952#endif 875#endif
953} 876}
954 877
955void 878void
956rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
957{ 880{
958#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
959 rxvt_color xcol; 882 rxvt_color xcol;
960 int i; 883
961
962 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
963 return; 885 return;
964 886
965 color = strdup (color); 887 color = strdup (color);
966 allocated.push_back ((void *)color); 888 allocated.push_back ((void *)color);
967 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
968 890
969 /* handle color aliases */ 891 /* handle color aliases */
970 if (isdigit (*color)) 892 if (isdigit (*color))
971 { 893 {
972 i = atoi (color); 894 int i = atoi (color);
973 895
974 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
897 {
975 { /* bright colors */ 898 /* bright colors */
976 i -= 8;
977 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978 goto done; 900 goto done;
979 } 901 }
980 902
981 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
904 {
982 { /* normal colors */ 905 /* normal colors */
983 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984 goto done; 907 goto done;
985 } 908 }
986 } 909 }
987 910
… …
992 * so just keep gobbling up the colormap 915 * so just keep gobbling up the colormap
993 */ 916 */
994 917
995 pix_colors_focused[idx] = xcol; 918 pix_colors_focused[idx] = xcol;
996 919
997 /* XSetWindowAttributes attr; */
998 /* Cursor cursor; */
999done: 920done:
1000 /*TODO: handle Color_BD, scrollbar background, etc. */ 921 /*TODO: handle Color_BD, scrollbar background, etc. */
1001 922
1002 update_fade_color (idx); 923 update_fade_color (idx);
1003 recolour_cursor (); 924 recolour_cursor ();
1004 scr_recolour (); 925 scr_recolour ();
1005#endif /* XTERM_COLOR_CHANGE */ 926#endif /* XTERM_COLOR_CHANGE */
1006} 927}
1007 928
1008void 929void
1009rxvt_term::recolour_cursor () 930rxvt_term::recolour_cursor ()
1010{ 931{
… …
1027 */ 948 */
1028void 949void
1029rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
1030{ 951{
1031 unsigned int i; 952 unsigned int i;
1032 const char *xpmb = "\0"; 953 const char *xpmb = "";
1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
1034 956
1035 strcpy (fstr, "default");
1036 strcpy (bstr, "default");
1037 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
1038 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
1039 { 959 {
1040 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
1041 break; 961 break;
1042 } 962 }
1043 963
1044 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 966 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
1048#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 969 xpmb = "default;";
1050#endif 970#endif
1051 break; 971 break;
1052 } 972 }
… …
1082 int old_width = szHint.width; 1002 int old_width = szHint.width;
1083 int old_height = szHint.height; 1003 int old_height = szHint.height;
1084 1004
1085 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
1086 1006
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1007 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1008
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint)
1011 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc);
1088 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
1089 1016
1090 if (!ignoreparent) 1017 if (!ignoreparent)
1091 { 1018 {
1092#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
1093 /* 1020 /*
… …
1097 int x, y, x1, y1; 1024 int x, y, x1, y1;
1098 int dx, dy; 1025 int dx, dy;
1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100 Window unused_cr; 1027 Window unused_cr;
1101 1028
1102 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
1103 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106 /* 1033 /*
1107 * if display->root isn't the parent window, a WM will probably have offset 1034 * if display->root isn't the parent window, a WM will probably have offset
1108 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
1109 */ 1036 */
… …
1126 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
1127 dy = 0; 1054 dy = 0;
1128 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
1129 dy /= 2; 1056 dy /= 2;
1130 1057
1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1132 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
1133#else 1060#else
1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1135#endif 1062#endif
1136 } 1063 }
1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent, &szHint);
1137 1067
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 1069
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 1071 {
1142 if (scrollBar.state) 1072 if (scrollBar.state)
1143 { 1073 scrollBar.resize ();
1144 XMoveResizeWindow (dpy, scrollBar.win,
1145 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar ();
1148 }
1149 1074
1150 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1152 width, height); 1077 width, height);
1153 1078
1154#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1155 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1156 update_background (); 1081 update_background ();
1157#endif 1082#endif
1158
1159 scr_clear ();
1160 } 1083 }
1161 1084
1162 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1163 scr_reset (); 1086 scr_reset ();
1164
1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166 //scr_touch (false);
1167
1168#ifdef HAVE_BG_PIXMAP
1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1170// if (bgPixmap.pixmap)
1171// scr_touch (false);
1172#endif
1173 1087
1174#ifdef USE_XIM 1088#ifdef USE_XIM
1175 IMSetPosition (); 1089 IMSetPosition ();
1176#endif 1090#endif
1177} 1091}
… …
1243 1157
1244/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1245bool 1159bool
1246rxvt_term::IMisRunning () 1160rxvt_term::IMisRunning ()
1247{ 1161{
1248 char *p;
1249 Atom atom; 1162 Atom atom;
1250 Window win; 1163 Window win;
1251 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1252 1165
1253 /* get current locale modifier */ 1166 /* get current locale modifier */
1254 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1255 { 1168 {
1256 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1258 1171
1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1260 *p = '\0'; 1173 *p = '\0';
1261 1174
1262 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1263 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1264 1177
1265 if (win != None) 1178 if (win != None)
1266 return True; 1179 return true;
1267 } 1180 }
1268 1181
1269 return False; 1182 return false;
1270} 1183}
1271 1184
1272void 1185void
1273rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1274{ 1187{
… …
1331 1244
1332 term->make_current (); 1245 term->make_current ();
1333 1246
1334 if (text) 1247 if (text)
1335 { 1248 {
1336 void *str; 1249 wchar_t *str;
1337 1250
1338 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 { 1252 {
1340 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1343 1256
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1346 1259
1347 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1349 } 1262 }
1350 else 1263 else
1351 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1352 1265
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1270 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1427 p = pet[pi]; 1340 p = pet[pi];
1428 1341
1429 if (!p) 1342 if (!p)
1430 continue; 1343 continue;
1431 1344
1432 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1433 1346
1434 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1435 { 1348 {
1436 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1437 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1449 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1450 1363
1451 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1452 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1453 { 1366 {
1454 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1455 1368
1456 found = 1; 1369 found = 1;
1457 goto foundpet; 1370 goto foundpet;
1458 } 1371 }
1459 1372
1460 } 1373 }
1461 1374
1462 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1463 } 1376 }
1464 1377
1465foundpet: 1378foundpet:
1466 1379
1467 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1570#endif 1483#endif
1571 1484
1572 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1573 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1574 XNClientWindow, vt, 1487 XNClientWindow, vt,
1575 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1576 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1577 preedit_attr, 1490 preedit_attr,
1578 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1579 status_attr, NULL); 1492 status_attr, NULL);
1580 1493
… …
1623 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1624 if (p && *p) 1537 if (p && *p)
1625 { 1538 {
1626 bool found = false; 1539 bool found = false;
1627 1540
1628 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1629 1542
1630 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1631 { 1544 {
1632 if (*s[i]) 1545 if (*s[i])
1633 { 1546 {
… …
1639 break; 1552 break;
1640 } 1553 }
1641 } 1554 }
1642 } 1555 }
1643 1556
1644 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1645 1558
1646 if (found) 1559 if (found)
1647 goto done; 1560 goto done;
1648 } 1561 }
1649 1562
… …
1676 1589
1677 if (input_style & XIMPreeditPosition) 1590 if (input_style & XIMPreeditPosition)
1678 { 1591 {
1679 im_set_size (preedit_rect); 1592 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1593 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681 1594
1682 XSetICValues (Input_Context, 1595 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL); 1596 XNPreeditAttributes, preedit_attr, NULL);
1684 } 1597 }
1685 else 1598 else
1686 { 1599 {
… …
1703 XFree (status_attr); 1616 XFree (status_attr);
1704 } 1617 }
1705 1618
1706 XFree (preedit_attr); 1619 XFree (preedit_attr);
1707} 1620}
1708#endif /* USE_XIM */ 1621#endif /* USE_XIM */
1709 1622
1710void 1623void
1711rxvt_term::get_window_origin (int &x, int &y) 1624rxvt_term::get_window_origin (int &x, int &y)
1712{ 1625{
1713 Window cr; 1626 Window cr;
1714 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1715/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1716} 1628}
1717 1629
1718Pixmap 1630Pixmap
1719rxvt_term::get_pixmap_property (int prop_id) 1631rxvt_term::get_pixmap_property (Atom property)
1720{ 1632{
1721 if (prop_id > 0 && prop_id < NUM_XA) 1633 Pixmap pixmap = None;
1722 if (xa[prop_id]) 1634
1723 {
1724 int aformat; 1635 int aformat;
1725 unsigned long nitems, bytes_after; 1636 unsigned long nitems, bytes_after;
1726 Atom atype; 1637 Atom atype;
1727 unsigned char *prop = NULL; 1638 unsigned char *prop;
1728 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1639 int result = XGetWindowProperty (dpy, display->root, property,
1729 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730 &nitems, &bytes_after, &prop); 1641 &nitems, &bytes_after, &prop);
1731 if (result == Success && prop && atype == XA_PIXMAP) 1642 if (result == Success)
1732 { 1643 {
1733 return *(Pixmap *)prop; 1644 if (atype == XA_PIXMAP)
1734 } 1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1735 } 1647 }
1736 return None; 1648
1649 return pixmap;
1737} 1650}
1738 1651
1739#ifdef HAVE_BG_PIXMAP 1652#ifdef HAVE_BG_PIXMAP
1740int 1653
1654void
1741rxvt_term::update_background () 1655rxvt_term::update_background ()
1742{ 1656{
1657 if (update_background_ev.is_active ())
1658 return;
1659
1743 bgPixmap.invalidate (); 1660 bg_invalidate ();
1744 1661
1745 /* no chance of real time refresh if we are blurring ! */ 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1663
1664 if (to_wait <= 0.)
1747 bgPixmap.render (); 1665 bg_render ();
1748 else 1666 else
1749 { 1667 update_background_ev.start (to_wait);
1668}
1669
1670void
1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1672{
1673 make_current ();
1674
1750 update_background_ev.stop (); 1675 update_background_ev.stop ();
1751 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */
1755 else
1756 update_background_ev.start (NOW + .07);
1757 }
1758 return 0;
1759}
1760
1761void
1762rxvt_term::update_background_cb (time_watcher &w)
1763{
1764 bgPixmap.render (); 1676 bg_render ();
1677 refresh_check ();
1765} 1678}
1766 1679
1767#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1768 1681
1769/*----------------------- end-of-file (C source) -----------------------*/ 1682/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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