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.239 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 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 <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
49#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# include <locale.h>
52#endif
53
54struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
52 56
53// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
55 59
… …
88class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
89 93
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 95{
92 compose_char *cc; 96 compose_char *cc;
93 97
94 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
96 cc = (*this)[c1]; 100 cc = (*this)[c1];
97 while (cc) 101 while (cc)
98 { 102 {
99 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
101 } 105 }
102 106
103 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
105 {
106 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
108 }
109 111
110 // allocate a new combination 112 // allocate a new combination
111 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
112 { 114 {
113 static int seen; 115 static int seen;
114 116
115 if (!seen++) 117 if (!seen++)
116 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
117 119
118 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
119 } 121 }
120 122
121 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
147 149
148} 150}
149#endif 151#endif
150 152
151rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
152 : 154{
155#if HAVE_BG_PIXMAP
156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
157#endif
158#ifdef CURSOR_BLINK
159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
160#endif
161#ifdef TEXT_BLINK
162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
163#endif
164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
166#endif
167#ifdef SELECTION_SCROLLING
168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169#endif
170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 175#endif
156#if ENABLE_TRANSPARENCY 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 177#if USE_XIM
158#endif 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 179#endif
177#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 182#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 185#endif
186 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 192
193 incr_ev (this, &rxvt_term::incr_cb)
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
197 termlist.push_back (this); 195 termlist.push_back (this);
198 196
199#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
201#endif 199#endif
202} 200}
203 201
204// clean up the most important stuff, do *not* call x or free mem etc. 202// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 203// for use before an emergency exit
204void
206void rxvt_term::emergency_cleanup () 205rxvt_term::emergency_cleanup ()
207{ 206{
208 if (cmd_pid) 207 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 208 kill (-cmd_pid, SIGHUP);
210 209
211 pty_ev.stop (); 210 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
224 delete fontset[i]; 223 delete fontset[i];
225#endif 224#endif
226 delete fontset[0]; 225 delete fontset[0];
227 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
228 if (display) 231 if (display)
229 { 232 {
230 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
231 235
232#ifdef USE_XIM 236#if USE_XIM
233 im_destroy (); 237 im_destroy ();
234#endif 238#endif
235#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
260 241
261 delete drawable; 242 delete drawable;
262 // destroy all windows 243 // destroy all windows
263 if (parent[0]) 244 if (parent)
264 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
265 246
266 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
268 { 249 {
269 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
271 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
272#endif 253#endif
273 } 254 }
274 255
275 clear (); 256 clear ();
276 }
277 257
278 delete [] pix_colors_focused; 258 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 259 displays.put (display);
260 }
284 261
285 scr_release (); 262 scr_release ();
286 263
287 /* clear all resources */ 264 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 266 free (allocated [i]);
290 267
291 free (selection.text); 268 free (selection.text);
292 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
293 free (env_display);
294 free (env_term);
295 free (locale); 270 free (locale);
296 free (v_buffer); 271 free (v_buffer);
297 free (incr_buf); 272
273 delete selection_req;
298 274
299 delete envv; 275 delete envv;
300 delete argv; 276 delete argv;
301 277
302#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
303 delete keyboard; 279 delete keyboard;
304#endif 280#endif
281#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db);
283#endif
305} 284}
306 285
307// child has exited, usually destroys 286// child has exited, usually destroys
308void 287void
309rxvt_term::child_cb (child_watcher &w, int status) 288rxvt_term::child_cb (ev::child &w, int status)
310{ 289{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 290 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 291
313 cmd_pid = 0; 292 cmd_pid = 0;
314 293
… …
317} 296}
318 297
319void 298void
320rxvt_term::destroy () 299rxvt_term::destroy ()
321{ 300{
322 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
323 return; 302 return;
324 303
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 305
327#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
331 if (display) 310 if (display)
332 { 311 {
333#if USE_XIM 312#if USE_XIM
334 im_ev.stop (display); 313 im_ev.stop (display);
335#endif 314#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
341#endif 318#endif
342 incr_ev.stop ();
343 termwin_ev.stop (display); 319 termwin_ev.stop (display);
344 vt_ev.stop (display); 320 vt_ev.stop (display);
345 } 321 }
346 322
347 check_ev.stop (); 323 flush_ev.stop ();
348 pty_ev.stop (); 324 pty_ev.stop ();
349#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
351#endif 327#endif
352#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
360#endif 336#endif
361#ifdef POINTER_BLANK 337#ifdef POINTER_BLANK
362 pointer_ev.stop (); 338 pointer_ev.stop ();
363#endif 339#endif
364 340
365 destroy_ev.start (0); 341 destroy_ev.start ();
366} 342}
367 343
368void 344void
369rxvt_term::destroy_cb (time_watcher &w) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 346{
371 make_current (); 347 make_current ();
372 348
373 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
374} 362}
375 363
376/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
377/* 365/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 367 */
381static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
382 369
383static void 370static void
384rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
388} 375}
389 376
390#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
391static void 378static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
393{ 380{
394 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
396 char number[32]; 383 char number[32];
397 char *mtype = "XlibMessage"; 384
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396
404 sprintf(number, "%d", event->request_code); 397 sprintf (number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("+ (which is %s)\n", buffer);
400
407 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
402 {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 403 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
409 mesg, BUFSIZ); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 405 }
406
412 if ((event->error_code == BadWindow) || 407 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 408 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 409 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 410 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 411 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 412 || event->error_code == BadColor
418 (event->error_code == BadGC) || 413 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 414 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 415 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 416 || event->error_code == BadAtom)
417 {
422 if (event->error_code == BadValue) 418 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 419 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 420 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 421 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ); 422 else
428 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 424
439int 425 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
426 }
427}
428#endif
429
430int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 431rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 432{
442 if (GET_R->allowedxerror == -1) 433 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
444 else 435 else
… …
453 } 444 }
454 445
455 return 0; 446 return 0;
456} 447}
457 448
458int 449int ecb_cold
459rxvt_xioerror_handler (Display *display) 450rxvt_xioerror_handler (Display *display)
460{ 451{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 452 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display)); 453 DisplayString (display));
463 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
465} 456}
466 457
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef ENABLE_TRANSPARENCY
510 if (option (Opt_transparent))
511 {
512 XSelectInput (dpy, display->root, PropertyChangeMask);
513 check_our_parents ();
514 rootwin_ev.start (display, display->root);
515 }
516#endif
517#if ENABLE_PERL
518 rootwin_ev.start (display, display->root);
519#endif
520
521 set_colorfgbg ();
522
523 init_command (cmd_argv);
524
525 free (cmd_argv);
526
527 if (pty->pty >= 0)
528 pty_ev.start (pty->pty, EVENT_READ);
529
530 check_ev.start ();
531
532 HOOK_INVOKE ((this, HOOK_START, DT_END));
533
534#if ENABLE_XEMBED
535 if (rs[Rs_embed])
536 {
537 long info[2] = { 0, XEMBED_MAPPED };
538
539 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
540 32, PropModeReplace, (unsigned char *)&info, 2);
541 }
542#endif
543
544 XMapWindow (dpy, vt);
545 XMapWindow (dpy, parent[0]);
546
547 return true;
548}
549
550static struct sig_handlers 458static struct sig_handlers
551{ 459{
552 sig_watcher sw_term, sw_int; 460 ev::sig sw_term, sw_int;
553 461
554 /* 462 /*
555 * Catch a fatal signal and tidy up before quitting 463 * Catch a fatal signal and tidy up before quitting
556 */ 464 */
557 void 465 void sig_term (ev::sig &w, int revents);
558 sig_term (sig_watcher &w) 466
467 sig_handlers ()
559 { 468 {
560 rxvt_emergency_cleanup (); 469 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
561 signal (w.signum, SIG_DFL);
562 kill (getpid (), w.signum);
563 }
564
565 sig_handlers ()
566 : sw_term (this, &sig_handlers::sig_term),
567 sw_int (this, &sig_handlers::sig_term) 470 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
568 {
569 } 471 }
570} sig_handlers; 472} sig_handlers;
571 473
474void
475sig_handlers::sig_term (ev::sig &w, int revents)
476{
477 rxvt_emergency_cleanup ();
478 w.stop ();
479 kill (getpid (), w.signum);
480}
481
482static void
483rxvt_get_ttymode (struct termios *tio)
484{
485 if (tcgetattr (STDIN_FILENO, tio) < 0)
486 memset (tio, 0, sizeof (struct termios));
487
488 for (int i = 0; i < NCCS; i++)
489 tio->c_cc[i] = VDISABLE;
490
491 tio->c_cc[VINTR] = CINTR;
492 tio->c_cc[VQUIT] = CQUIT;
493 tio->c_cc[VERASE] = CERASE;
494#ifdef VERASE2
495 tio->c_cc[VERASE2] = CERASE2;
496#endif
497 tio->c_cc[VKILL] = CKILL;
498 tio->c_cc[VEOF] = CEOF;
499 tio->c_cc[VSTART] = CSTART;
500 tio->c_cc[VSTOP] = CSTOP;
501 tio->c_cc[VSUSP] = CSUSP;
502# ifdef VDSUSP
503 tio->c_cc[VDSUSP] = CDSUSP;
504# endif
505# ifdef VREPRINT
506 tio->c_cc[VREPRINT] = CRPRNT;
507# endif
508# ifdef VDISCRD
509 tio->c_cc[VDISCRD] = CFLUSH;
510# endif
511# ifdef VWERSE
512 tio->c_cc[VWERSE] = CWERASE;
513# endif
514# ifdef VLNEXT
515 tio->c_cc[VLNEXT] = CLNEXT;
516# endif
517# ifdef VSTATUS
518 tio->c_cc[VSTATUS] = CSTATUS;
519# endif
520
521# if VMIN != VEOF
522 tio->c_cc[VMIN] = 1;
523# endif
524# if VTIME != VEOL
525 tio->c_cc[VTIME] = 0;
526# endif
527
528 /* input modes */
529 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
530# ifdef IMAXBEL
531 | IMAXBEL
532# endif
533 | IXON);
534
535 /* output modes */
536 tio->c_oflag = (OPOST | ONLCR);
537
538 /* control modes */
539 tio->c_cflag = (CS8 | CREAD);
540
541 /* local modes */
542 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
543# if defined (ECHOCTL) && defined (ECHOKE)
544 | ECHOCTL | ECHOKE
545# endif
546 | ECHOE | ECHOK);
547}
548
572char **rxvt_environ; // startup environment 549char **rxvt_environ; // startup environment
573 550
574void 551void
575rxvt_init () 552rxvt_init ()
576{ 553{
577 ptytty::init (); 554 assert (("fontMask must not overlap other RS masks",
555 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
556
557 rxvt_get_ttymode (&rxvt_term::def_tio);
558
559 // get rid of stdin/stdout as we don't need them, to free resources
560 dup2 (STDERR_FILENO, STDIN_FILENO);
561 dup2 (STDERR_FILENO, STDOUT_FILENO);
562
563 if (!ev_default_loop ())
564 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578 565
579 rxvt_environ = environ; 566 rxvt_environ = environ;
580 567
581 signal (SIGHUP, SIG_IGN); 568 signal (SIGHUP, SIG_IGN);
582 signal (SIGPIPE, SIG_IGN); 569 signal (SIGPIPE, SIG_IGN);
583 570
584 sig_handlers.sw_term.start (SIGTERM); 571 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
585 sig_handlers.sw_int.start (SIGINT); 572 sig_handlers.sw_int.start (SIGINT); ev_unref ();
586
587 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
588 /* signal (SIGURG, SIG_DFL); */
589 573
590 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
591 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
592 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
593 577
594 XrmInitialize (); 578 XrmInitialize ();
595}
596 579
597/* ------------------------------------------------------------------------- * 580#if HAVE_PIXBUF
598 * MEMORY ALLOCATION WRAPPERS * 581 g_type_init ();
599 * ------------------------------------------------------------------------- */ 582#endif
600void *
601rxvt_malloc (size_t size)
602{
603 void *p = malloc (size);
604
605 if (!p)
606 rxvt_fatal ("memory allocation failure. aborting.\n");
607
608 return p;
609}
610
611void *
612rxvt_calloc (size_t number, size_t size)
613{
614 void *p = calloc (number, size);
615
616 if (!p)
617 rxvt_fatal ("memory allocation failure. aborting.\n");
618
619 return p;
620}
621
622void *
623rxvt_realloc (void *ptr, size_t size)
624{
625 void *p = realloc (ptr, size);
626
627 if (!p)
628 rxvt_fatal ("memory allocation failure. aborting.\n");
629
630 return p;
631} 583}
632 584
633/*----------------------------------------------------------------------*/ 585/*----------------------------------------------------------------------*/
634/* 586/*
635 * window size/position calculations for XSizeHint and other storage. 587 * window size/position calculations for XSizeHint and other storage.
… …
637 */ 589 */
638void 590void
639rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 591rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
640{ 592{
641 short recalc_x, recalc_y; 593 short recalc_x, recalc_y;
642 int x, y, sb_w, flags; 594 int x, y, flags;
643 unsigned int w, h; 595 unsigned int w, h;
644 unsigned int max_width, max_height; 596 unsigned int max_width, max_height;
645 597
646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 598 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
647 szHint.win_gravity = NorthWestGravity; 599 szHint.win_gravity = NorthWestGravity;
… …
657 if (rs[Rs_geometry]) 609 if (rs[Rs_geometry])
658 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 610 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
659 611
660 if (flags & WidthValue) 612 if (flags & WidthValue)
661 { 613 {
614 if (!w)
615 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
616
662 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 617 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
663 szHint.flags |= USSize; 618 szHint.flags |= USSize;
664 } 619 }
665 620
666 if (flags & HeightValue) 621 if (flags & HeightValue)
667 { 622 {
623 if (!h)
624 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
625
668 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 626 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
669 szHint.flags |= USSize; 627 szHint.flags |= USSize;
670 } 628 }
671 629
672 if (flags & XValue) 630 if (flags & XValue)
673 { 631 {
… …
704 max_width = MAX_COLS * fwidth; 662 max_width = MAX_COLS * fwidth;
705 max_height = MAX_ROWS * fheight; 663 max_height = MAX_ROWS * fheight;
706 664
707 szHint.base_width = szHint.base_height = 2 * int_bwidth; 665 szHint.base_width = szHint.base_height = 2 * int_bwidth;
708 666
709 sb_w = 0;
710 window_vt_x = window_vt_y = int_bwidth; 667 window_vt_x = window_vt_y = int_bwidth;
711 668
712 if (scrollBar.state) 669 if (scrollBar.state)
713 { 670 {
714 sb_w = scrollbar_TotalWidth (); 671 int sb_w = scrollBar.total_width ();
715 szHint.base_width += sb_w; 672 szHint.base_width += sb_w;
716 673
717 if (!option (Opt_scrollBar_right)) 674 if (!option (Opt_scrollBar_right))
718 window_vt_x += sb_w; 675 window_vt_x += sb_w;
719 } 676 }
… …
743 { 700 {
744 min_it (height, max_height); 701 min_it (height, max_height);
745 szHint.height = szHint.base_height + height; 702 szHint.height = szHint.base_height + height;
746 } 703 }
747 704
748 if (scrollBar.state && option (Opt_scrollBar_right))
749 window_sb_x = szHint.width - sb_w;
750
751 if (recalc_x) 705 if (recalc_x)
752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 706 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
753 707
754 if (recalc_y) 708 if (recalc_y)
755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 709 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
756 710
757 ncol = width / fwidth; 711 ncol = width / fwidth;
758 nrow = height / fheight; 712 nrow = height / fheight;
713
714 // When the size of the vt window is not a multiple of the cell
715 // size, i.e., when the wm does not honour our size hints, there are
716 // extra areas not covered by the terminal screen. Such gaps, when a
717 // bg pixmap is set, would have to be cleared manually to properly
718 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps.
720 vt_width = ncol * fwidth;
721 vt_height = nrow * fheight;
759} 722}
760 723
761/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
762/* 725/*
763 * Tell the teletype handler what size the window is. 726 * Tell the teletype handler what size the window is.
… …
771 734
772 struct winsize ws; 735 struct winsize ws;
773 736
774 ws.ws_col = ncol; 737 ws.ws_col = ncol;
775 ws.ws_row = nrow; 738 ws.ws_row = nrow;
776 ws.ws_xpixel = width; 739 ws.ws_xpixel = vt_width;
777 ws.ws_ypixel = height; 740 ws.ws_ypixel = vt_height;
778 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 741 ioctl (pty->pty, TIOCSWINSZ, &ws);
779 742
780#if 0 743#if 0
781 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 744 // TIOCSWINSZ is supposed to do this automatically and correctly
782 if (cmd_pid) /* force through to the command */ 745 if (cmd_pid) /* force through to the command */
783 kill (-cmd_pid, SIGWINCH); 746 kill (-cmd_pid, SIGWINCH);
784#endif 747#endif
785} 748}
786 749
787/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
788/* set_fonts () - load and set the various fonts 751/* load and set the various fonts */
789 *
790 * init = 1 - initialize
791 *
792 * fontname == FONT_UP - switch to bigger font
793 * fontname == FONT_DN - switch to smaller font
794 */
795bool 752bool
796rxvt_term::set_fonts () 753rxvt_term::set_fonts ()
797{ 754{
798 rxvt_fontset *fs = new rxvt_fontset (this); 755 rxvt_fontset *fs = new rxvt_fontset (this);
799 rxvt_fontprop prop; 756 rxvt_fontprop prop;
… …
813#endif 770#endif
814 771
815 delete fontset[0]; 772 delete fontset[0];
816 fontset[0] = fs; 773 fontset[0] = fs;
817 774
818 prop = (*fs)[1]->properties (); 775 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
819 prop.height += lineSpace; 776 prop.width += letterSpace;
820 777
821 fs->set_prop (prop, false); 778 fs->set_prop (prop, false);
822 779
823 fwidth = prop.width; 780 fwidth = prop.width;
824 fheight = prop.height; 781 fheight = prop.height + lineSpace;
825 fbase = prop.ascent; 782 fbase = prop.ascent;
826 783
827 for (int style = 1; style < 4; style++) 784 for (int style = 1; style < 4; style++)
828 { 785 {
829#if ENABLE_STYLES 786#if ENABLE_STYLES
… …
855#else 812#else
856 fontset[style] = fontset[0]; 813 fontset[style] = fontset[0];
857#endif 814#endif
858 } 815 }
859 816
860 if (parent[0]) 817 if (parent)
861 { 818 {
862 resize_all_windows (0, 0, 0); 819 resize_all_windows (0, 0, 0);
863 scr_remap_chars (); 820 scr_remap_chars ();
864 scr_touch (true); 821 scr_touch (true);
865 } 822 }
866 823
867 return true; 824 return true;
868} 825}
869 826
827void
870void rxvt_term::set_string_property (Atom prop, const char *str, int len) 828rxvt_term::set_string_property (Atom prop, const char *str, int len)
871{ 829{
872 XChangeProperty (dpy, parent[0], 830 XChangeProperty (dpy, parent,
873 prop, XA_STRING, 8, PropModeReplace, 831 prop, XA_STRING, 8, PropModeReplace,
874 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 832 (const unsigned char *)str, len >= 0 ? len : strlen (str));
875} 833}
876 834
835void
836rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
837{
838 XTextProperty ct;
839
840 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
841 {
842 XSetTextProperty (dpy, parent, &ct, prop);
843 XFree (ct.value);
844 }
845}
846
847void
877void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 848rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
878{ 849{
879 wchar_t *ws = rxvt_mbstowcs (str, len); 850 wchar_t *ws = rxvt_mbstowcs (str, len);
880 char *s = rxvt_wcstoutf8 (ws); 851 char *s = rxvt_wcstoutf8 (ws);
881 852
882 XChangeProperty (dpy, parent[0], 853 XChangeProperty (dpy, parent,
883 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 854 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
884 (const unsigned char *)s, strlen (s)); 855 (const unsigned char *)s, strlen (s));
885 856
886 free (s); 857 free (s);
887 free (ws); 858 free (ws);
… …
891/*----------------------------------------------------------------------*/ 862/*----------------------------------------------------------------------*/
892/* xterm sequences - title, iconName, color (exptl) */ 863/* xterm sequences - title, iconName, color (exptl) */
893void 864void
894rxvt_term::set_title (const char *str) 865rxvt_term::set_title (const char *str)
895{ 866{
896 set_string_property (XA_WM_NAME, str); 867 set_mbstring_property (XA_WM_NAME, str);
897#if ENABLE_EWMH 868#if ENABLE_EWMH
898 set_utf8_property (xa[XA_NET_WM_NAME], str); 869 set_utf8_property (xa[XA_NET_WM_NAME], str);
899#endif 870#endif
900} 871}
901 872
902void 873void
903rxvt_term::set_icon_name (const char *str) 874rxvt_term::set_icon_name (const char *str)
904{ 875{
905 set_string_property (XA_WM_ICON_NAME, str); 876 set_mbstring_property (XA_WM_ICON_NAME, str);
906#if ENABLE_EWMH 877#if ENABLE_EWMH
907 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 878 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
908#endif 879#endif
909} 880}
910 881
882void
883rxvt_term::set_window_color (int idx, const char *color)
884{
911#ifdef XTERM_COLOR_CHANGE 885#ifdef XTERM_COLOR_CHANGE
912void
913rxvt_term::set_window_color (int idx, const char *color)
914{
915 rxvt_color xcol; 886 rxvt_color xcol;
916 int i; 887
917
918 if (color == NULL || *color == '\0') 888 if (color == NULL || *color == '\0')
919 return; 889 return;
920 890
921 color = strdup (color); 891 color = strdup (color);
922 allocated.push_back ((void *)color); 892 allocated.push_back ((void *)color);
923 rs[Rs_color + idx] = color; 893 rs[Rs_color + idx] = color;
924 894
925 /* handle color aliases */ 895 /* handle color aliases */
926 if (isdigit (*color)) 896 if (isdigit (*color))
927 { 897 {
928 i = atoi (color); 898 int i = atoi (color);
929 899
930 if (i >= 8 && i <= 15) 900 if (i >= 8 && i <= 15)
901 {
931 { /* bright colors */ 902 /* bright colors */
932 i -= 8;
933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 903 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934 goto done; 904 goto done;
935 } 905 }
936 906
937 if (i >= 0 && i <= 7) 907 if (i >= 0 && i <= 7)
908 {
938 { /* normal colors */ 909 /* normal colors */
939 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 910 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
940 goto done; 911 goto done;
941 } 912 }
942 } 913 }
943 914
… …
948 * so just keep gobbling up the colormap 919 * so just keep gobbling up the colormap
949 */ 920 */
950 921
951 pix_colors_focused[idx] = xcol; 922 pix_colors_focused[idx] = xcol;
952 923
953 /* XSetWindowAttributes attr; */
954 /* Cursor cursor; */
955done: 924done:
956 /*TODO: handle Color_BD, scrollbar background, etc. */ 925 /*TODO: handle Color_BD, scrollbar background, etc. */
957 926
958 update_fade_color (idx); 927 update_fade_color (idx);
959 recolour_cursor (); 928 recolour_cursor ();
960 scr_recolour (); 929 scr_recolour ();
930#endif /* XTERM_COLOR_CHANGE */
961} 931}
962
963#else
964# define set_window_color (idx,color) ((void)0)
965#endif /* XTERM_COLOR_CHANGE */
966 932
967void 933void
968rxvt_term::recolour_cursor () 934rxvt_term::recolour_cursor ()
969{ 935{
970 XColor fg, bg; 936 XColor fg, bg;
… …
982 948
983/*----------------------------------------------------------------------*/ 949/*----------------------------------------------------------------------*/
984/* 950/*
985 * find if fg/bg matches any of the normal (low-intensity) colors 951 * find if fg/bg matches any of the normal (low-intensity) colors
986 */ 952 */
987void 953char *
988rxvt_term::set_colorfgbg () 954rxvt_term::get_colorfgbg ()
989{ 955{
990 unsigned int i; 956 unsigned int i;
991 const char *xpmb = "\0"; 957 const char *xpmb = "";
992 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 958 char fstr[] = "default";
959 char bstr[] = "default";
960 char *env_colorfgbg;
993 961
994 strcpy (fstr, "default");
995 strcpy (bstr, "default");
996 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_fg] == pix_colors[i]) 963 if (pix_colors[Color_fg] == pix_colors[i])
998 { 964 {
999 sprintf (fstr, "%d", (i - Color_Black)); 965 sprintf (fstr, "%d", i - Color_Black);
1000 break; 966 break;
1001 } 967 }
1002 968
1003 for (i = Color_Black; i <= Color_White; i++) 969 for (i = Color_Black; i <= Color_White; i++)
1004 if (pix_colors[Color_bg] == pix_colors[i]) 970 if (pix_colors[Color_bg] == pix_colors[i])
1005 { 971 {
1006 sprintf (bstr, "%d", (i - Color_Black)); 972 sprintf (bstr, "%d", i - Color_Black);
1007#ifdef XPM_BACKGROUND 973#if BG_IMAGE_FROM_FILE
1008 xpmb = "default;"; 974 xpmb = "default;";
1009#endif 975#endif
1010 break; 976 break;
1011 } 977 }
1012 978
979 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1013 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 980 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
981 return env_colorfgbg;
1014} 982}
1015 983
1016/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
1017 985
1018bool 986bool
… …
1041 int old_width = szHint.width; 1009 int old_width = szHint.width;
1042 int old_height = szHint.height; 1010 int old_height = szHint.height;
1043 1011
1044 window_calc (newwidth, newheight); 1012 window_calc (newwidth, newheight);
1045 1013
1046 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1014 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1015
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint)
1018 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc);
1047 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc;
1022 }
1048 1023
1049 if (!ignoreparent) 1024 if (!ignoreparent)
1050 { 1025 {
1051#ifdef SMART_RESIZE 1026#ifdef SMART_RESIZE
1052 /* 1027 /*
… …
1056 int x, y, x1, y1; 1031 int x, y, x1, y1;
1057 int dx, dy; 1032 int dx, dy;
1058 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1059 Window unused_cr; 1034 Window unused_cr;
1060 1035
1061 XTranslateCoordinates (dpy, parent[0], display->root, 1036 XTranslateCoordinates (dpy, parent, display->root,
1062 0, 0, &x, &y, &unused_cr); 1037 0, 0, &x, &y, &unused_cr);
1063 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1038 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1064 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1065 /* 1040 /*
1066 * if display->root isn't the parent window, a WM will probably have offset 1041 * if display->root isn't the parent window, a WM will probably have offset
1067 * our position for handles and decorations. Counter it 1042 * our position for handles and decorations. Counter it
1068 */ 1043 */
… …
1085 if (y < y1) /* top half */ 1060 if (y < y1) /* top half */
1086 dy = 0; 1061 dy = 0;
1087 else if (y == y1) /* exact center */ 1062 else if (y == y1) /* exact center */
1088 dy /= 2; 1063 dy /= 2;
1089 1064
1090 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1065 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1091 szHint.width, szHint.height); 1066 szHint.width, szHint.height);
1092#else 1067#else
1093 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1094#endif 1069#endif
1095 } 1070 }
1071
1072 if (set_hint)
1073 XSetWMNormalHints (dpy, parent, &szHint);
1096 1074
1097 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1098 1076
1099 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
1100 { 1078 {
1101 if (scrollBar.state) 1079 if (scrollBar.state)
1102 { 1080 scrollBar.resize ();
1103 XMoveResizeWindow (dpy, scrollBar.win,
1104 window_sb_x, 0,
1105 scrollbar_TotalWidth (), szHint.height);
1106 resize_scrollbar ();
1107 }
1108 1081
1109 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1110 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1111 width, height); 1084 vt_width, vt_height);
1112 1085
1113 scr_clear (); 1086 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1114#ifdef XPM_BACKGROUND 1087
1115 resize_pixmap (); 1088#ifdef HAVE_BG_PIXMAP
1089 if (bg_window_size_sensitive ())
1090 update_background ();
1116#endif 1091#endif
1117 } 1092 }
1118 1093
1119 if (fix_screen || old_height == 0) 1094 if (fix_screen || old_height == 0)
1120 scr_reset (); 1095 scr_reset ();
1121 1096
1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123 //scr_touch (false);
1124
1125#ifdef HAVE_BG_PIXMAP
1126 if (bgPixmap.pixmap)
1127 scr_touch (false);
1128#endif
1129
1130#ifdef USE_XIM 1097#if USE_XIM
1131 IMSetPosition (); 1098 im_set_position ();
1132#endif 1099#endif
1133} 1100}
1134 1101
1135/* 1102/*
1136 * Set the width/height of the vt window in characters. Units are pixels. 1103 * Set the width/height of the vt window in characters. Units are pixels.
… …
1149 newwidth = wattr.width - szHint.base_width; 1116 newwidth = wattr.width - szHint.base_width;
1150 if (newheight == 0) 1117 if (newheight == 0)
1151 newheight = wattr.height - szHint.base_height; 1118 newheight = wattr.height - szHint.base_height;
1152 } 1119 }
1153 1120
1154 if (newwidth != width || newheight != height) 1121 if (newwidth != vt_width || newheight != vt_height)
1155 { 1122 {
1156 newwidth += szHint.base_width; 1123 newwidth += szHint.base_width;
1157 newheight += szHint.base_height; 1124 newheight += szHint.base_height;
1158 resize_all_windows (newwidth, newheight, 0); 1125 resize_all_windows (newwidth, newheight, 0);
1159 } 1126 }
1160} 1127}
1161 1128
1162/* -------------------------------------------------------------------- * 1129/* -------------------------------------------------------------------- *
1163 * - X INPUT METHOD ROUTINES - * 1130 * - X INPUT METHOD ROUTINES - *
1164 * -------------------------------------------------------------------- */ 1131 * -------------------------------------------------------------------- */
1165#ifdef USE_XIM 1132#if USE_XIM
1166 1133
1167void 1134void
1168rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1135rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1169{ 1136{
1170 fg = pix_colors [Color_fg]; 1137 fg = pix_colors [Color_fg];
… …
1197 status_rect.height = fheight; 1164 status_rect.height = fheight;
1198} 1165}
1199 1166
1200/* Checking whether input method is running. */ 1167/* Checking whether input method is running. */
1201bool 1168bool
1202rxvt_term::IMisRunning () 1169rxvt_term::im_is_running ()
1203{ 1170{
1204 char *p;
1205 Atom atom; 1171 Atom atom;
1206 Window win; 1172 Window win;
1207 char server[IMBUFSIZ]; 1173 char server[IMBUFSIZ];
1208 1174
1209 /* get current locale modifier */ 1175 /* get current locale modifier */
1210 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1176 if (char *p = XSetLocaleModifiers (0))
1211 { 1177 {
1212 strcpy (server, "@server="); 1178 strcpy (server, "@server=");
1213 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1179 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1214 1180
1215 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1181 if (p = strchr (server + 1, '@')) /* first one only */
1216 *p = '\0'; 1182 *p = '\0';
1217 1183
1218 atom = XInternAtom (dpy, server, False); 1184 atom = XInternAtom (dpy, server, False);
1219 win = XGetSelectionOwner (dpy, atom); 1185 win = XGetSelectionOwner (dpy, atom);
1220 1186
1221 if (win != None) 1187 if (win != None)
1222 return True; 1188 return true;
1223 } 1189 }
1224 1190
1225 return False; 1191 return false;
1226} 1192}
1227 1193
1228void 1194void
1229rxvt_term::IMSendSpot () 1195rxvt_term::im_send_spot ()
1230{ 1196{
1231 XPoint nspot; 1197 XPoint nspot;
1232 XVaNestedList preedit_attr; 1198 XVaNestedList preedit_attr;
1233 1199
1234 if (!Input_Context 1200 if (!Input_Context
… …
1287 1253
1288 term->make_current (); 1254 term->make_current ();
1289 1255
1290 if (text) 1256 if (text)
1291 { 1257 {
1292 void *str; 1258 wchar_t *str;
1293 1259
1294 if (!text->encoding_is_wchar && text->string.multi_byte) 1260 if (!text->encoding_is_wchar && text->string.multi_byte)
1295 { 1261 {
1296 // of course, X makes it ugly again 1262 // of course, X makes it ugly again
1297 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->rs[Rs_imLocale]); 1264 SET_LOCALE (term->rs[Rs_imLocale]);
1299 1265
1300 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1266 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1301 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1267 mbstowcs (str, text->string.multi_byte, text->length + 1);
1302 1268
1303 if (term->rs[Rs_imLocale]) 1269 if (term->rs[Rs_imLocale])
1304 SET_LOCALE (term->locale); 1270 SET_LOCALE (term->locale);
1305 } 1271 }
1306 else 1272 else
1307 str = (void *)text->string.wide_char; 1273 str = text->string.wide_char;
1308 1274
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1275 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret, 1276 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first, 1277 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length, 1278 DT_INT, call_data->chg_length,
1313 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1279 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1340/* 1306/*
1341 * Try to open a XIM with the current modifiers, then see if we can 1307 * Try to open a XIM with the current modifiers, then see if we can
1342 * open a suitable preedit type 1308 * open a suitable preedit type
1343 */ 1309 */
1344bool 1310bool
1345rxvt_term::IM_get_IC (const char *modifiers) 1311rxvt_term::im_get_ic (const char *modifiers)
1346{ 1312{
1347 int i, j, found; 1313 int i, j, found;
1348 XIM xim; 1314 XIM xim;
1349 XPoint spot; 1315 XPoint spot;
1350 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1351 unsigned long fg, bg; 1317 unsigned long fg, bg;
1352 const char *p; 1318 const char *p;
1353 char **s; 1319 char **s;
1354 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1355#ifdef ENABLE_XIM_ONTHESPOT
1356 XIMCallback xcb[4];
1357#endif
1358 1321
1359 set_environ (envv); 1322 set_environ (envv);
1360 1323
1361 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1362 return false; 1325 return false;
… …
1383 p = pet[pi]; 1346 p = pet[pi];
1384 1347
1385 if (!p) 1348 if (!p)
1386 continue; 1349 continue;
1387 1350
1388 s = rxvt_splitcommastring (p); 1351 s = rxvt_strsplit (',', p);
1389 1352
1390 for (i = found = 0; !found && s[i]; i++) 1353 for (i = found = 0; !found && s[i]; i++)
1391 { 1354 {
1392 if (!strcmp (s[i], "OverTheSpot")) 1355 if (!strcmp (s[i], "OverTheSpot"))
1393 input_style = XIMPreeditPosition | XIMStatusNothing; 1356 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1405 input_style = XIMPreeditNothing | XIMStatusNothing; 1368 input_style = XIMPreeditNothing | XIMStatusNothing;
1406 1369
1407 for (j = 0; j < xim_styles->count_styles; j++) 1370 for (j = 0; j < xim_styles->count_styles; j++)
1408 if (input_style == xim_styles->supported_styles[j]) 1371 if (input_style == xim_styles->supported_styles[j])
1409 { 1372 {
1410 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1411 1374
1412 found = 1; 1375 found = 1;
1413 goto foundpet; 1376 goto foundpet;
1414 } 1377 }
1415 1378
1416 } 1379 }
1417 1380
1418 rxvt_freecommastring (s); 1381 rxvt_free_strsplit (s);
1419 } 1382 }
1420 1383
1421foundpet: 1384foundpet:
1422 1385
1423 XFree (xim_styles); 1386 XFree (xim_styles);
… …
1502 NULL); 1465 NULL);
1503 } 1466 }
1504#if ENABLE_XIM_ONTHESPOT 1467#if ENABLE_XIM_ONTHESPOT
1505 else if (input_style & XIMPreeditCallbacks) 1468 else if (input_style & XIMPreeditCallbacks)
1506 { 1469 {
1470 XIMCallback xcb[4];
1471
1507 im_set_position (spot); 1472 im_set_position (spot);
1508 1473
1509 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1474 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1510 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1475 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1511 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1476 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1526#endif 1491#endif
1527 1492
1528 Input_Context = XCreateIC (xim, 1493 Input_Context = XCreateIC (xim,
1529 XNInputStyle, input_style, 1494 XNInputStyle, input_style,
1530 XNClientWindow, vt, 1495 XNClientWindow, vt,
1531 XNFocusWindow, parent[0], 1496 XNFocusWindow, parent,
1532 preedit_attr ? XNPreeditAttributes : NULL, 1497 preedit_attr ? XNPreeditAttributes : NULL,
1533 preedit_attr, 1498 preedit_attr,
1534 status_attr ? XNStatusAttributes : NULL, 1499 status_attr ? XNStatusAttributes : NULL,
1535 status_attr, NULL); 1500 status_attr, NULL);
1536 1501
… …
1549 // unfortunately, only the focus window is used by XIM, hard to fix 1514 // unfortunately, only the focus window is used by XIM, hard to fix
1550 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1515 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1551 vt_select_input (); 1516 vt_select_input ();
1552#endif 1517#endif
1553 1518
1554 IMSetPosition (); 1519 im_set_position ();
1555 1520
1556 return true; 1521 return true;
1557} 1522}
1558 1523
1559void 1524void
… …
1569 im_destroy (); 1534 im_destroy ();
1570 1535
1571 if (Input_Context) 1536 if (Input_Context)
1572 return; 1537 return;
1573 1538
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1539 if (rs[Rs_imLocale])
1576 SET_LOCALE (rs[Rs_imLocale]); 1540 SET_LOCALE (rs[Rs_imLocale]);
1577#endif
1578 1541
1579 p = rs[Rs_inputMethod]; 1542 p = rs[Rs_inputMethod];
1580 if (p && *p) 1543 if (p && *p)
1581 { 1544 {
1582 bool found = false; 1545 bool found = false;
1583 1546
1584 s = rxvt_splitcommastring (p); 1547 s = rxvt_strsplit (',', p);
1585 1548
1586 for (i = 0; s[i]; i++) 1549 for (i = 0; s[i]; i++)
1587 { 1550 {
1588 if (*s[i]) 1551 if (*s[i])
1589 { 1552 {
1590 strcpy (buf, "@im="); 1553 strcpy (buf, "@im=");
1591 strncat (buf, s[i], IMBUFSIZ - 5); 1554 strncat (buf, s[i], IMBUFSIZ - 5);
1592 if (IM_get_IC (buf)) 1555 if (im_get_ic (buf))
1593 { 1556 {
1594 found = true; 1557 found = true;
1595 break; 1558 break;
1596 } 1559 }
1597 } 1560 }
1598 } 1561 }
1599 1562
1600 rxvt_freecommastring (s); 1563 rxvt_free_strsplit (s);
1601 1564
1602 if (found) 1565 if (found)
1603 goto done; 1566 goto done;
1604 } 1567 }
1605 1568
1606 /* try with XMODIFIERS env. var. */ 1569 /* try with XMODIFIERS env. var. */
1607 if (IM_get_IC ("")) 1570 if (im_get_ic (""))
1608 goto done; 1571 goto done;
1609 1572
1610 /* try with no modifiers base IF the user didn't specify an IM */ 1573 /* try with no modifiers base IF the user didn't specify an IM */
1611 if (IM_get_IC ("@im=none")) 1574 if (im_get_ic ("@im=none"))
1612 goto done; 1575 goto done;
1613 1576
1614done: 1577done:
1615#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1616 if (rs[Rs_imLocale]) 1578 if (rs[Rs_imLocale])
1617 SET_LOCALE (locale); 1579 SET_LOCALE (locale);
1618#endif
1619} 1580}
1620 1581
1621void 1582void
1622rxvt_term::IMSetPosition () 1583rxvt_term::im_set_position ()
1623{ 1584{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1626 1587
1627 if (!Input_Context 1588 if (!Input_Context
1628 || !focus 1589 || !focus
1629 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1630 || !IMisRunning ()) 1591 || !im_is_running ())
1631 return; 1592 return;
1632 1593
1633 if (input_style & XIMPreeditPosition) 1594 if (input_style & XIMPreeditPosition)
1634 { 1595 {
1635 im_set_size (preedit_rect); 1596 im_set_size (preedit_rect);
1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1597 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637 1598
1638 XSetICValues (Input_Context, 1599 XSetICValues (Input_Context,
1639 XNPreeditAttributes, preedit_attr, NULL); 1600 XNPreeditAttributes, preedit_attr, NULL);
1640 } 1601 }
1641 else 1602 else
1642 { 1603 {
… …
1659 XFree (status_attr); 1620 XFree (status_attr);
1660 } 1621 }
1661 1622
1662 XFree (preedit_attr); 1623 XFree (preedit_attr);
1663} 1624}
1664#endif /* USE_XIM */ 1625#endif /* USE_XIM */
1626
1627void
1628rxvt_term::get_window_origin (int &x, int &y)
1629{
1630 Window cr;
1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1632}
1633
1634#ifdef HAVE_BG_PIXMAP
1635
1636void
1637rxvt_term::update_background ()
1638{
1639 if (update_background_ev.is_active ())
1640 return;
1641
1642 bg_invalidate ();
1643
1644 if (!mapped)
1645 return;
1646
1647 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1648
1649 if (to_wait <= 0.)
1650 bg_render ();
1651 else
1652 update_background_ev.start (to_wait);
1653}
1654
1655void
1656rxvt_term::update_background_cb (ev::timer &w, int revents)
1657{
1658 make_current ();
1659
1660 update_background_ev.stop ();
1661 bg_render ();
1662 refresh_check ();
1663}
1664
1665#endif /* HAVE_BG_PIXMAP */
1665 1666
1666/*----------------------- end-of-file (C source) -----------------------*/ 1667/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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