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.256 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 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
… …
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)
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 (ev::child &w, int status) 293rxvt_term::child_cb (ev::child &w, int status)
… …
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 prepare_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
… …
370 345
371 destroy_ev.start (); 346 destroy_ev.start ();
372} 347}
373 348
374void 349void
375rxvt_term::destroy_cb (ev::check &w, int revents) 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, 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 460static struct sig_handlers
593{ 461{
594 ev::sig 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
600 sig_term (ev::sig &w, int revents) 467 void sig_term (ev::sig &w, int revents);
468
469 sig_handlers ()
601 { 470 {
602 rxvt_emergency_cleanup (); 471 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) 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
620 ev::ev_default_loop (0); 565 if (!ev_default_loop ())
566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 567
622 rxvt_environ = environ; 568 rxvt_environ = environ;
623 569
624 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
626 572
627 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
628 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
629
630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
631 /* signal (SIGURG, SIG_DFL); */
632 575
633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
634 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
635 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
636 579
637 XrmInitialize (); 580 XrmInitialize ();
638}
639
640/* ------------------------------------------------------------------------- *
641 * MEMORY ALLOCATION WRAPPERS *
642 * ------------------------------------------------------------------------- */
643void *
644rxvt_malloc (size_t size)
645{
646 void *p = malloc (size);
647
648 if (!p)
649 rxvt_fatal ("memory allocation failure. aborting.\n");
650
651 return p;
652}
653
654void *
655rxvt_calloc (size_t number, size_t size)
656{
657 void *p = calloc (number, size);
658
659 if (!p)
660 rxvt_fatal ("memory allocation failure. aborting.\n");
661
662 return p;
663}
664
665void *
666rxvt_realloc (void *ptr, size_t size)
667{
668 void *p = realloc (ptr, size);
669
670 if (!p)
671 rxvt_fatal ("memory allocation failure. aborting.\n");
672
673 return p;
674} 581}
675 582
676/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
677/* 584/*
678 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
680 */ 587 */
681void 588void
682rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
683{ 590{
684 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
685 int x, y, sb_w, flags; 592 int x, y, flags;
686 unsigned int w, h; 593 unsigned int w, h;
687 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
688 595
689 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
690 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
700 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
701 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
702 609
703 if (flags & WidthValue) 610 if (flags & WidthValue)
704 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
705 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
706 szHint.flags |= USSize; 616 szHint.flags |= USSize;
707 } 617 }
708 618
709 if (flags & HeightValue) 619 if (flags & HeightValue)
710 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
711 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
712 szHint.flags |= USSize; 625 szHint.flags |= USSize;
713 } 626 }
714 627
715 if (flags & XValue) 628 if (flags & XValue)
716 { 629 {
… …
747 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
748 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
749 662
750 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
751 664
752 sb_w = 0;
753 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
754 666
755 if (scrollBar.state) 667 if (scrollBar.state)
756 { 668 {
757 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
758 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
759 671
760 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
761 window_vt_x += sb_w; 673 window_vt_x += sb_w;
762 } 674 }
… …
786 { 698 {
787 min_it (height, max_height); 699 min_it (height, max_height);
788 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
789 } 701 }
790 702
791 if (scrollBar.state && option (Opt_scrollBar_right))
792 window_sb_x = szHint.width - sb_w;
793
794 if (recalc_x) 703 if (recalc_x)
795 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
796 705
797 if (recalc_y) 706 if (recalc_y)
798 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
799 708
800 ncol = width / fwidth; 709 ncol = width / fwidth;
801 nrow = height / fheight; 710 nrow = height / fheight;
802} 711}
803 712
804/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
805/* 714/*
… …
816 725
817 ws.ws_col = ncol; 726 ws.ws_col = ncol;
818 ws.ws_row = nrow; 727 ws.ws_row = nrow;
819 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
820 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
821 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
822 731
823#if 0 732#if 0
824 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
825 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
826 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
827#endif 736#endif
828} 737}
829 738
830/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
831/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
832 *
833 * init = 1 - initialize
834 *
835 * fontname == FONT_UP - switch to bigger font
836 * fontname == FONT_DN - switch to smaller font
837 */
838bool 741bool
839rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
840{ 743{
841 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
842 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
856#endif 759#endif
857 760
858 delete fontset[0]; 761 delete fontset[0];
859 fontset[0] = fs; 762 fontset[0] = fs;
860 763
861 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
862 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
863 767
864 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
865 769
866 fwidth = prop.width; 770 fwidth = prop.width;
867 fheight = prop.height; 771 fheight = prop.height;
… …
898#else 802#else
899 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
900#endif 804#endif
901 } 805 }
902 806
903 if (parent[0]) 807 if (parent)
904 { 808 {
905 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
906 scr_remap_chars (); 810 scr_remap_chars ();
907 scr_touch (true); 811 scr_touch (true);
908 } 812 }
… …
911} 815}
912 816
913void 817void
914rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
915{ 819{
916 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
917 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
918 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
919} 823}
920 824
921void 825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
922rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
923{ 839{
924 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
925 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
926 842
927 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
928 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
929 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
930 846
931 free (s); 847 free (s);
932 free (ws); 848 free (ws);
… …
936/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
937/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
938void 854void
939rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
940{ 856{
941 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
942#if ENABLE_EWMH 858#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
944#endif 860#endif
945} 861}
946 862
947void 863void
948rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
949{ 865{
950 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
951#if ENABLE_EWMH 867#if ENABLE_EWMH
952 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
953#endif 869#endif
954} 870}
955 871
956void 872void
957rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
958{ 874{
959#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
960 rxvt_color xcol; 876 rxvt_color xcol;
961 int i;
962 877
963 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
964 return; 879 return;
965 880
966 color = strdup (color); 881 color = strdup (color);
… …
968 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
969 884
970 /* handle color aliases */ 885 /* handle color aliases */
971 if (isdigit (*color)) 886 if (isdigit (*color))
972 { 887 {
973 i = atoi (color); 888 int i = atoi (color);
974 889
975 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
891 {
976 { /* bright colors */ 892 /* bright colors */
977 i -= 8;
978 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
979 goto done; 894 goto done;
980 } 895 }
981 896
982 if (i >= 0 && i <= 7) 897 if (i >= 0 && i <= 7)
898 {
983 { /* normal colors */ 899 /* normal colors */
984 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
985 goto done; 901 goto done;
986 } 902 }
987 } 903 }
988 904
… …
993 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
994 */ 910 */
995 911
996 pix_colors_focused[idx] = xcol; 912 pix_colors_focused[idx] = xcol;
997 913
998 /* XSetWindowAttributes attr; */
999 /* Cursor cursor; */
1000done: 914done:
1001 /*TODO: handle Color_BD, scrollbar background, etc. */ 915 /*TODO: handle Color_BD, scrollbar background, etc. */
1002 916
1003 update_fade_color (idx); 917 update_fade_color (idx);
1004 recolour_cursor (); 918 recolour_cursor ();
1005 scr_recolour (); 919 scr_recolour ();
1006#endif /* XTERM_COLOR_CHANGE */ 920#endif /* XTERM_COLOR_CHANGE */
1007} 921}
1008 922
1009void 923void
1010rxvt_term::recolour_cursor () 924rxvt_term::recolour_cursor ()
1011{ 925{
… …
1028 */ 942 */
1029void 943void
1030rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
1031{ 945{
1032 unsigned int i; 946 unsigned int i;
1033 const char *xpmb = "\0"; 947 const char *xpmb = "";
1034 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
1035 950
1036 strcpy (fstr, "default");
1037 strcpy (bstr, "default");
1038 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
1039 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
1040 { 953 {
1041 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
1042 break; 955 break;
1043 } 956 }
1044 957
1045 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1046 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
1047 { 960 {
1048 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
1049#ifdef BG_IMAGE_FROM_FILE 962#ifdef BG_IMAGE_FROM_FILE
1050 xpmb = "default;"; 963 xpmb = "default;";
1051#endif 964#endif
1052 break; 965 break;
1053 } 966 }
… …
1083 int old_width = szHint.width; 996 int old_width = szHint.width;
1084 int old_height = szHint.height; 997 int old_height = szHint.height;
1085 998
1086 window_calc (newwidth, newheight); 999 window_calc (newwidth, newheight);
1087 1000
1088 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1001 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1002
1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1004 if (set_hint)
1005 {
1006 szHint.flags &= ~(PBaseSize | PResizeInc);
1089 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1008 szHint.flags |= PBaseSize | PResizeInc;
1009 }
1090 1010
1091 if (!ignoreparent) 1011 if (!ignoreparent)
1092 { 1012 {
1093#ifdef SMART_RESIZE 1013#ifdef SMART_RESIZE
1094 /* 1014 /*
… …
1098 int x, y, x1, y1; 1018 int x, y, x1, y1;
1099 int dx, dy; 1019 int dx, dy;
1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1101 Window unused_cr; 1021 Window unused_cr;
1102 1022
1103 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1104 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1105 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1107 /* 1027 /*
1108 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
1109 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1110 */ 1030 */
… …
1127 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1128 dy = 0; 1048 dy = 0;
1129 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1130 dy /= 2; 1050 dy /= 2;
1131 1051
1132 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1133 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1134#else 1054#else
1135 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1136#endif 1056#endif
1137 } 1057 }
1058
1059 if (set_hint)
1060 XSetWMNormalHints (dpy, parent, &szHint);
1138 1061
1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1140 1063
1141 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1142 { 1065 {
1143 if (scrollBar.state) 1066 if (scrollBar.state)
1144 { 1067 scrollBar.resize ();
1145 XMoveResizeWindow (dpy, scrollBar.win,
1146 window_sb_x, 0,
1147 scrollbar_TotalWidth (), szHint.height);
1148 resize_scrollbar ();
1149 }
1150 1068
1151 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1152 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1153 width, height); 1071 width, height);
1154 1072
1155#ifdef HAVE_BG_PIXMAP 1073#ifdef HAVE_BG_PIXMAP
1156 if (bgPixmap.window_size_sensitive ()) 1074 if (bg_window_size_sensitive ())
1157 update_background (); 1075 update_background ();
1158#endif 1076#endif
1159
1160 scr_clear ();
1161 } 1077 }
1162 1078
1163 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1164 scr_reset (); 1080 scr_reset ();
1165 1081
1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1167 //scr_touch (false);
1168
1169#ifdef HAVE_BG_PIXMAP
1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1171// if (bgPixmap.pixmap)
1172// scr_touch (false);
1173#endif
1174
1175#ifdef USE_XIM 1082#ifdef USE_XIM
1176 IMSetPosition (); 1083 im_set_position ();
1177#endif 1084#endif
1178} 1085}
1179 1086
1180/* 1087/*
1181 * Set the width/height of the vt window in characters. Units are pixels. 1088 * Set the width/height of the vt window in characters. Units are pixels.
… …
1242 status_rect.height = fheight; 1149 status_rect.height = fheight;
1243} 1150}
1244 1151
1245/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1246bool 1153bool
1247rxvt_term::IMisRunning () 1154rxvt_term::im_is_running ()
1248{ 1155{
1249 char *p;
1250 Atom atom; 1156 Atom atom;
1251 Window win; 1157 Window win;
1252 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1253 1159
1254 /* get current locale modifier */ 1160 /* get current locale modifier */
1255 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1161 if (char *p = XSetLocaleModifiers (0))
1256 { 1162 {
1257 strcpy (server, "@server="); 1163 strcpy (server, "@server=");
1258 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1164 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1259 1165
1260 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1166 if (p = strchr (server + 1, '@')) /* first one only */
1261 *p = '\0'; 1167 *p = '\0';
1262 1168
1263 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1264 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1265 1171
1266 if (win != None) 1172 if (win != None)
1267 return True; 1173 return true;
1268 } 1174 }
1269 1175
1270 return False; 1176 return false;
1271} 1177}
1272 1178
1273void 1179void
1274rxvt_term::IMSendSpot () 1180rxvt_term::im_send_spot ()
1275{ 1181{
1276 XPoint nspot; 1182 XPoint nspot;
1277 XVaNestedList preedit_attr; 1183 XVaNestedList preedit_attr;
1278 1184
1279 if (!Input_Context 1185 if (!Input_Context
… …
1332 1238
1333 term->make_current (); 1239 term->make_current ();
1334 1240
1335 if (text) 1241 if (text)
1336 { 1242 {
1337 void *str; 1243 wchar_t *str;
1338 1244
1339 if (!text->encoding_is_wchar && text->string.multi_byte) 1245 if (!text->encoding_is_wchar && text->string.multi_byte)
1340 { 1246 {
1341 // of course, X makes it ugly again 1247 // of course, X makes it ugly again
1342 if (term->rs[Rs_imLocale]) 1248 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->rs[Rs_imLocale]); 1249 SET_LOCALE (term->rs[Rs_imLocale]);
1344 1250
1345 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1251 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1346 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1252 mbstowcs (str, text->string.multi_byte, text->length + 1);
1347 1253
1348 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->locale); 1255 SET_LOCALE (term->locale);
1350 } 1256 }
1351 else 1257 else
1352 str = (void *)text->string.wide_char; 1258 str = text->string.wide_char;
1353 1259
1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1260 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355 DT_INT, call_data->caret, 1261 DT_INT, call_data->caret,
1356 DT_INT, call_data->chg_first, 1262 DT_INT, call_data->chg_first,
1357 DT_INT, call_data->chg_length, 1263 DT_INT, call_data->chg_length,
… …
1385/* 1291/*
1386 * Try to open a XIM with the current modifiers, then see if we can 1292 * Try to open a XIM with the current modifiers, then see if we can
1387 * open a suitable preedit type 1293 * open a suitable preedit type
1388 */ 1294 */
1389bool 1295bool
1390rxvt_term::IM_get_IC (const char *modifiers) 1296rxvt_term::im_get_ic (const char *modifiers)
1391{ 1297{
1392 int i, j, found; 1298 int i, j, found;
1393 XIM xim; 1299 XIM xim;
1394 XPoint spot; 1300 XPoint spot;
1395 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1396 unsigned long fg, bg; 1302 unsigned long fg, bg;
1397 const char *p; 1303 const char *p;
1398 char **s; 1304 char **s;
1399 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1400#ifdef ENABLE_XIM_ONTHESPOT
1401 XIMCallback xcb[4];
1402#endif
1403 1306
1404 set_environ (envv); 1307 set_environ (envv);
1405 1308
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1310 return false;
… …
1428 p = pet[pi]; 1331 p = pet[pi];
1429 1332
1430 if (!p) 1333 if (!p)
1431 continue; 1334 continue;
1432 1335
1433 s = rxvt_splitcommastring (p); 1336 s = rxvt_strsplit (',', p);
1434 1337
1435 for (i = found = 0; !found && s[i]; i++) 1338 for (i = found = 0; !found && s[i]; i++)
1436 { 1339 {
1437 if (!strcmp (s[i], "OverTheSpot")) 1340 if (!strcmp (s[i], "OverTheSpot"))
1438 input_style = XIMPreeditPosition | XIMStatusNothing; 1341 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1450 input_style = XIMPreeditNothing | XIMStatusNothing; 1353 input_style = XIMPreeditNothing | XIMStatusNothing;
1451 1354
1452 for (j = 0; j < xim_styles->count_styles; j++) 1355 for (j = 0; j < xim_styles->count_styles; j++)
1453 if (input_style == xim_styles->supported_styles[j]) 1356 if (input_style == xim_styles->supported_styles[j])
1454 { 1357 {
1455 rxvt_freecommastring (s); 1358 rxvt_free_strsplit (s);
1456 1359
1457 found = 1; 1360 found = 1;
1458 goto foundpet; 1361 goto foundpet;
1459 } 1362 }
1460 1363
1461 } 1364 }
1462 1365
1463 rxvt_freecommastring (s); 1366 rxvt_free_strsplit (s);
1464 } 1367 }
1465 1368
1466foundpet: 1369foundpet:
1467 1370
1468 XFree (xim_styles); 1371 XFree (xim_styles);
… …
1547 NULL); 1450 NULL);
1548 } 1451 }
1549#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1550 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1551 { 1454 {
1455 XIMCallback xcb[4];
1456
1552 im_set_position (spot); 1457 im_set_position (spot);
1553 1458
1554 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1555 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1556 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1571#endif 1476#endif
1572 1477
1573 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1574 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1575 XNClientWindow, vt, 1480 XNClientWindow, vt,
1576 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1577 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1578 preedit_attr, 1483 preedit_attr,
1579 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1580 status_attr, NULL); 1485 status_attr, NULL);
1581 1486
… …
1594 // unfortunately, only the focus window is used by XIM, hard to fix 1499 // unfortunately, only the focus window is used by XIM, hard to fix
1595 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1500 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1596 vt_select_input (); 1501 vt_select_input ();
1597#endif 1502#endif
1598 1503
1599 IMSetPosition (); 1504 im_set_position ();
1600 1505
1601 return true; 1506 return true;
1602} 1507}
1603 1508
1604void 1509void
… …
1624 p = rs[Rs_inputMethod]; 1529 p = rs[Rs_inputMethod];
1625 if (p && *p) 1530 if (p && *p)
1626 { 1531 {
1627 bool found = false; 1532 bool found = false;
1628 1533
1629 s = rxvt_splitcommastring (p); 1534 s = rxvt_strsplit (',', p);
1630 1535
1631 for (i = 0; s[i]; i++) 1536 for (i = 0; s[i]; i++)
1632 { 1537 {
1633 if (*s[i]) 1538 if (*s[i])
1634 { 1539 {
1635 strcpy (buf, "@im="); 1540 strcpy (buf, "@im=");
1636 strncat (buf, s[i], IMBUFSIZ - 5); 1541 strncat (buf, s[i], IMBUFSIZ - 5);
1637 if (IM_get_IC (buf)) 1542 if (im_get_ic (buf))
1638 { 1543 {
1639 found = true; 1544 found = true;
1640 break; 1545 break;
1641 } 1546 }
1642 } 1547 }
1643 } 1548 }
1644 1549
1645 rxvt_freecommastring (s); 1550 rxvt_free_strsplit (s);
1646 1551
1647 if (found) 1552 if (found)
1648 goto done; 1553 goto done;
1649 } 1554 }
1650 1555
1651 /* try with XMODIFIERS env. var. */ 1556 /* try with XMODIFIERS env. var. */
1652 if (IM_get_IC ("")) 1557 if (im_get_ic (""))
1653 goto done; 1558 goto done;
1654 1559
1655 /* try with no modifiers base IF the user didn't specify an IM */ 1560 /* try with no modifiers base IF the user didn't specify an IM */
1656 if (IM_get_IC ("@im=none")) 1561 if (im_get_ic ("@im=none"))
1657 goto done; 1562 goto done;
1658 1563
1659done: 1564done:
1660#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1565#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1661 if (rs[Rs_imLocale]) 1566 if (rs[Rs_imLocale])
1662 SET_LOCALE (locale); 1567 SET_LOCALE (locale);
1663#endif 1568#endif
1664} 1569}
1665 1570
1666void 1571void
1667rxvt_term::IMSetPosition () 1572rxvt_term::im_set_position ()
1668{ 1573{
1669 XRectangle preedit_rect, status_rect, *needed_rect; 1574 XRectangle preedit_rect, status_rect, *needed_rect;
1670 XVaNestedList preedit_attr, status_attr; 1575 XVaNestedList preedit_attr, status_attr;
1671 1576
1672 if (!Input_Context 1577 if (!Input_Context
1673 || !focus 1578 || !focus
1674 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1579 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1675 || !IMisRunning ()) 1580 || !im_is_running ())
1676 return; 1581 return;
1677 1582
1678 if (input_style & XIMPreeditPosition) 1583 if (input_style & XIMPreeditPosition)
1679 { 1584 {
1680 im_set_size (preedit_rect); 1585 im_set_size (preedit_rect);
… …
1704 XFree (status_attr); 1609 XFree (status_attr);
1705 } 1610 }
1706 1611
1707 XFree (preedit_attr); 1612 XFree (preedit_attr);
1708} 1613}
1709#endif /* USE_XIM */ 1614#endif /* USE_XIM */
1710 1615
1711void 1616void
1712rxvt_term::get_window_origin (int &x, int &y) 1617rxvt_term::get_window_origin (int &x, int &y)
1713{ 1618{
1714 Window cr; 1619 Window cr;
1715 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1716/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1717} 1621}
1718 1622
1719Pixmap 1623Pixmap
1720rxvt_term::get_pixmap_property (int prop_id) 1624rxvt_term::get_pixmap_property (Atom property)
1721{ 1625{
1722 if (prop_id > 0 && prop_id < NUM_XA) 1626 Pixmap pixmap = None;
1723 if (xa[prop_id]) 1627
1724 {
1725 int aformat; 1628 int aformat;
1726 unsigned long nitems, bytes_after; 1629 unsigned long nitems, bytes_after;
1727 Atom atype; 1630 Atom atype;
1728 unsigned char *prop = NULL; 1631 unsigned char *prop;
1729 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1632 int result = XGetWindowProperty (dpy, display->root, property,
1730 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1633 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1731 &nitems, &bytes_after, &prop); 1634 &nitems, &bytes_after, &prop);
1732 if (result == Success && prop && atype == XA_PIXMAP) 1635 if (result == Success)
1733 { 1636 {
1734 return *(Pixmap *)prop; 1637 if (atype == XA_PIXMAP)
1735 } 1638 pixmap = *(Pixmap *)prop;
1639 XFree (prop);
1736 } 1640 }
1737 return None; 1641
1642 return pixmap;
1738} 1643}
1739 1644
1740#ifdef HAVE_BG_PIXMAP 1645#ifdef HAVE_BG_PIXMAP
1741int 1646
1647void
1742rxvt_term::update_background () 1648rxvt_term::update_background ()
1743{ 1649{
1650 if (update_background_ev.is_active ())
1651 return;
1652
1744 bgPixmap.invalidate (); 1653 bg_invalidate ();
1745 1654
1746 /* no chance of real time refresh if we are blurring! */ 1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1747 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1656
1657 if (to_wait <= 0.)
1748 bgPixmap.render (); 1658 bg_render ();
1749 else 1659 else
1750 {
1751 update_background_ev.stop ();
1752
1753 if (!bgPixmap.need_client_side_rendering())
1754 update_background_ev.start (.05); 1660 update_background_ev.start (to_wait);
1755 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1756 update_background_ev.start (.20); /* very slow !!! */
1757 else
1758 update_background_ev.start (.07);
1759 }
1760
1761 return 0;
1762} 1661}
1763 1662
1764void 1663void
1765rxvt_term::update_background_cb (ev::timer &w, int revents) 1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1766{ 1665{
1666 make_current ();
1667
1668 update_background_ev.stop ();
1767 bgPixmap.render (); 1669 bg_render ();
1670 refresh_check ();
1768} 1671}
1769 1672
1770#endif /* HAVE_BG_PIXMAP */ 1673#endif /* HAVE_BG_PIXMAP */
1771 1674
1772/*----------------------- end-of-file (C source) -----------------------*/ 1675/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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