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.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 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 TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
49#endif 53# endif
54#endif
50 55
56struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
52 58
53// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
55 61
56static char curlocale[128], savelocale[128]; 62static char curlocale[128], savelocale[128];
57 63
58bool 64bool
59rxvt_set_locale (const char *locale) NOTHROW 65rxvt_set_locale (const char *locale) NOTHROW
60{ 66{
67 int size = strlen (locale) + 1;
68
69 if (size > sizeof (curlocale))
70 rxvt_fatal ("locale string too long, aborting.\n");
71
61 if (!locale || !strncmp (locale, curlocale, 128)) 72 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 73 return false;
63 74
64 strncpy (curlocale, locale, 128); 75 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 76 setlocale (LC_CTYPE, curlocale);
66 return true; 77 return true;
67} 78}
68 79
69void 80void
… …
83class rxvt_composite_vec rxvt_composite; 94class rxvt_composite_vec rxvt_composite;
84 95
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 97{
87 compose_char *cc; 98 compose_char *cc;
88 99
89 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
91 cc = (*this)[c1]; 102 cc = (*this)[c1];
92 while (cc) 103 while (cc)
93 { 104 {
94 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
96 } 107 }
97 108
98 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
100 {
101 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
103 }
104 113
105 // allocate a new combination 114 // allocate a new combination
106 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
107 { 116 {
108 static int seen; 117 static int seen;
109 118
110 if (!seen++) 119 if (!seen++)
111 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
112 121
113 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
114 } 123 }
115 124
116 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
142 151
143} 152}
144#endif 153#endif
145 154
146rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
147 : 156{
148#if TRANSPARENT || ENABLE_PERL 157#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 162#endif
157#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 165#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 168#endif
163#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 171#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 184#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 185#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 187#endif
178 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 194
185 incr_ev (this, &rxvt_term::incr_cb)
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 196
189 termlist.push_back (this); 197 termlist.push_back (this);
190 198
191#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
193#endif 201#endif
194} 202}
195 203
196// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
203 pty_ev.stop (); 212 pty_ev.stop ();
… …
215 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
216 delete fontset[i]; 225 delete fontset[i];
217#endif 226#endif
218 delete fontset[0]; 227 delete fontset[0];
219 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
220 if (display) 233 if (display)
221 { 234 {
222 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
223 237
224#ifdef USE_XIM 238#ifdef USE_XIM
225 im_destroy (); 239 im_destroy ();
226#endif 240#endif
227#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
230#endif
231#ifdef PLAIN_SCROLLBAR
232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233#endif
234#ifdef NEXT_SCROLLBAR
235 if (blackGC) XFreeGC (dpy, blackGC);
236 if (whiteGC) XFreeGC (dpy, whiteGC);
237 if (grayGC) XFreeGC (dpy, grayGC);
238 if (darkGC) XFreeGC (dpy, darkGC);
239 if (stippleGC) XFreeGC (dpy, stippleGC);
240 if (dimple) XFreePixmap (dpy, dimple);
241 if (upArrow) XFreePixmap (dpy, upArrow);
242 if (downArrow) XFreePixmap (dpy, downArrow);
243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245#endif
246#ifdef RXVT_SCROLLBAR
247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250#endif
251 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
252 243
253 delete drawable; 244 delete drawable;
254 // destroy all windows 245 // destroy all windows
255 if (parent[0]) 246 if (parent)
256 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
257 248
258 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
260 { 251 {
261 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
263 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
264#endif 255#endif
265 } 256 }
266 257
267 clear (); 258 clear ();
268 }
269 259
270 delete pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
271#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused;
273#endif
274
275 displays.put (display); 261 displays.put (display);
262 }
276 263
277 scr_release (); 264 scr_release ();
278 265
279 /* clear all resources */ 266 /* clear all resources */
280 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
281 free (allocated [i]); 268 free (allocated [i]);
282 269
283 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
284 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
285 free (env_display); 273 free (env_display);
286 free (env_term); 274 free (env_term);
287 free (locale); 275 free (locale);
288 free (v_buffer); 276 free (v_buffer);
289 free (incr_buf); 277
278 delete selection_req;
290 279
291 delete envv; 280 delete envv;
292 delete argv; 281 delete argv;
293 282
294#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
295 delete keyboard; 284 delete keyboard;
296#endif 285#endif
286#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db);
288#endif
297} 289}
298 290
299// child has exited, usually destroys 291// child has exited, usually destroys
300void 292void
301rxvt_term::child_cb (child_watcher &w, int status) 293rxvt_term::child_cb (ev::child &w, int status)
302{ 294{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 296
305 cmd_pid = 0; 297 cmd_pid = 0;
306 298
307 if (!OPTION (Opt_hold)) 299 if (!option (Opt_hold))
308 destroy (); 300 destroy ();
309} 301}
310 302
311void 303void
312rxvt_term::destroy () 304rxvt_term::destroy ()
313{ 305{
314 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
315 return; 307 return;
316 308
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318 310
319#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
… …
323 if (display) 315 if (display)
324 { 316 {
325#if USE_XIM 317#if USE_XIM
326 im_ev.stop (display); 318 im_ev.stop (display);
327#endif 319#endif
328#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
330#endif
331#if TRANSPARENT || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
333#endif 323#endif
334 incr_ev.stop ();
335 termwin_ev.stop (display); 324 termwin_ev.stop (display);
336 vt_ev.stop (display); 325 vt_ev.stop (display);
337 } 326 }
338 327
339 check_ev.stop (); 328 flush_ev.stop ();
340 pty_ev.stop (); 329 pty_ev.stop ();
341#ifdef CURSOR_BLINK 330#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 331 cursor_blink_ev.stop ();
343#endif 332#endif
344#ifdef TEXT_BLINK 333#ifdef TEXT_BLINK
… …
352#endif 341#endif
353#ifdef POINTER_BLANK 342#ifdef POINTER_BLANK
354 pointer_ev.stop (); 343 pointer_ev.stop ();
355#endif 344#endif
356 345
357 destroy_ev.start (0); 346 destroy_ev.start ();
358} 347}
359 348
360void 349void
361rxvt_term::destroy_cb (time_watcher &w) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 351{
363 make_current (); 352 make_current ();
364 353
365 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);
366} 367}
367 368
368/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
369/* 370/*
370 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
384print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
385{ 386{
386 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
387 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
388 char number[32]; 389 char number[32];
389 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
390 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
392 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");
393 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
394 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
396 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
397 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
398 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
399 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
400 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
401 mesg, BUFSIZ); 402 mesg, BUFSIZ);
402 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
403 } 404 }
404 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
405 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
406 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
407 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
408 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
409 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
410 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
411 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
412 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
413 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
414 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
416 mesg, BUFSIZ); 417 mesg, BUFSIZ);
417 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
418 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
419 mesg, BUFSIZ); 420 mesg, BUFSIZ);
420 else 421 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 423 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 425 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 427 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 429}
429#endif 430#endif
430 431
431int 432int
… …
454 DisplayString (display)); 455 DisplayString (display));
455 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
456 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
457} 458}
458 459
459/*----------------------------------------------------------------------*/
460bool
461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
462{
463 this->envv = envv;
464
465 SET_R (this);
466 set_locale ("");
467 set_environ (envv); // few things in X do not call setlocale :(
468
469 if (!init_vars ())
470 return false;
471
472 init_secondary ();
473
474 const char **cmd_argv = init_resources (argc, argv);
475
476#ifdef KEYSYM_RESOURCE
477 keyboard->register_done ();
478#endif
479
480#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */
483#endif
484
485 pty = ptytty::create ();
486
487 create_windows (argc, argv);
488
489 init_xlocale ();
490
491 scr_reset (); // initialize screen
492
493#if 0
494 XSynchronize (dpy, True);
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */
500#endif
501#ifdef TRANSPARENT
502 if (OPTION (Opt_transparent))
503 {
504 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root);
507 }
508#endif
509#if ENABLE_PERL
510 rootwin_ev.start (display, display->root);
511#endif
512
513 set_colorfgbg ();
514
515 init_command (cmd_argv);
516
517 free (cmd_argv);
518
519 if (pty->pty >= 0)
520 pty_ev.start (pty->pty, EVENT_READ);
521
522 check_ev.start ();
523
524 HOOK_INVOKE ((this, HOOK_START, DT_END));
525
526#if ENABLE_XEMBED
527 if (rs[Rs_embed])
528 {
529 long info[2] = { 0, XEMBED_MAPPED };
530
531 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
532 32, PropModeReplace, (unsigned char *)&info, 2);
533 }
534#endif
535
536 XMapWindow (dpy, vt);
537 XMapWindow (dpy, parent[0]);
538
539 return true;
540}
541
542static struct sig_handlers 460static struct sig_handlers
543{ 461{
544 sig_watcher sw_term, sw_int; 462 ev::sig sw_term, sw_int;
545 463
546 /* 464 /*
547 * Catch a fatal signal and tidy up before quitting 465 * Catch a fatal signal and tidy up before quitting
548 */ 466 */
549 void 467 void sig_term (ev::sig &w, int revents);
550 sig_term (sig_watcher &w) 468
469 sig_handlers ()
551 { 470 {
552 rxvt_emergency_cleanup (); 471 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
553 signal (w.signum, SIG_DFL);
554 kill (getpid (), w.signum);
555 }
556
557 sig_handlers ()
558 : sw_term (this, &sig_handlers::sig_term),
559 sw_int (this, &sig_handlers::sig_term) 472 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
560 {
561 } 473 }
562} sig_handlers; 474} sig_handlers;
563 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
564char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
565 552
566void 553void
567rxvt_init () 554rxvt_init ()
568{ 555{
569 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
565 if (!ev_default_loop ())
566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
570 567
571 rxvt_environ = environ; 568 rxvt_environ = environ;
572 569
573 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
574 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
575 572
576 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
577 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
578
579 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
580 /* signal (SIGURG, SIG_DFL); */
581 575
582 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
583 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
584 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
585 579
586 XrmInitialize (); 580 XrmInitialize ();
587} 581}
588 582
589/* ------------------------------------------------------------------------- *
590 * MEMORY ALLOCATION WRAPPERS *
591 * ------------------------------------------------------------------------- */
592void *
593rxvt_malloc (size_t size)
594{
595 void *p = malloc (size);
596
597 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n");
599
600 return p;
601}
602
603void *
604rxvt_calloc (size_t number, size_t size)
605{
606 void *p = calloc (number, size);
607
608 if (!p)
609 rxvt_fatal ("memory allocation failure. aborting.\n");
610
611 return p;
612}
613
614void *
615rxvt_realloc (void *ptr, size_t size)
616{
617 void *p = realloc (ptr, size);
618
619 if (!p)
620 rxvt_fatal ("memory allocation failure. aborting.\n");
621
622 return p;
623}
624
625/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
626/* 584/*
627 * window size/position calculcations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
628 * if width/height are non-zero then override calculated width/height 586 * if width/height are non-zero then override calculated width/height
629 */ 587 */
630void 588void
631rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
632{ 590{
633 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
634 int x, y, sb_w, flags; 592 int x, y, flags;
635 unsigned int w, h; 593 unsigned int w, h;
636 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
637 595
638 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
639 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
649 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
650 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
651 609
652 if (flags & WidthValue) 610 if (flags & WidthValue)
653 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
654 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
655 szHint.flags |= USSize; 616 szHint.flags |= USSize;
656 } 617 }
657 618
658 if (flags & HeightValue) 619 if (flags & HeightValue)
659 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
660 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
661 szHint.flags |= USSize; 625 szHint.flags |= USSize;
662 } 626 }
663 627
664 if (flags & XValue) 628 if (flags & XValue)
665 { 629 {
… …
696 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
697 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
698 662
699 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
700 664
701 sb_w = 0;
702 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
703 666
704 if (scrollBar.state) 667 if (scrollBar.state)
705 { 668 {
706 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
707 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
708 671
709 if (!OPTION (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
710 window_vt_x += sb_w; 673 window_vt_x += sb_w;
711 } 674 }
712 675
713 szHint.width_inc = fwidth; 676 szHint.width_inc = fwidth;
714 szHint.height_inc = fheight; 677 szHint.height_inc = fheight;
… …
735 { 698 {
736 min_it (height, max_height); 699 min_it (height, max_height);
737 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
738 } 701 }
739 702
740 if (scrollBar.state && OPTION (Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w;
742
743 if (recalc_x) 703 if (recalc_x)
744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745 705
746 if (recalc_y) 706 if (recalc_y)
747 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
748 708
749 ncol = width / fwidth; 709 ncol = width / fwidth;
750 nrow = height / fheight; 710 nrow = height / fheight;
751} 711}
752 712
753/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
754/* 714/*
… …
765 725
766 ws.ws_col = ncol; 726 ws.ws_col = ncol;
767 ws.ws_row = nrow; 727 ws.ws_row = nrow;
768 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
769 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
770 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
771 731
772#if 0 732#if 0
773 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
774 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
775 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
776#endif 736#endif
777} 737}
778 738
779/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
780/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
781 *
782 * init = 1 - initialize
783 *
784 * fontname == FONT_UP - switch to bigger font
785 * fontname == FONT_DN - switch to smaller font
786 */
787bool 741bool
788rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
789{ 743{
790 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
791 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
805#endif 759#endif
806 760
807 delete fontset[0]; 761 delete fontset[0];
808 fontset[0] = fs; 762 fontset[0] = fs;
809 763
810 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
811 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
767
812 fs->set_prop (prop); 768 fs->set_prop (prop, false);
813 769
814 fwidth = prop.width; 770 fwidth = prop.width;
815 fheight = prop.height; 771 fheight = prop.height;
816 fbase = prop.ascent; 772 fbase = prop.ascent;
817 773
… …
826 { 782 {
827 fontset[style] = fs = new rxvt_fontset (this); 783 fontset[style] = fs = new rxvt_fontset (this);
828 rxvt_fontprop prop2 = prop; 784 rxvt_fontprop prop2 = prop;
829 785
830 if (res) 786 if (res)
831 prop2.weight = prop2.slant = rxvt_fontprop::unset; 787 {
788 fs->populate (res);
789 fs->set_prop (prop2, false);
790 }
832 else 791 else
833 { 792 {
834 res = fontset[0]->fontdesc; 793 fs->populate (fontset[0]->fontdesc);
835 794
836 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 795 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
837 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 796 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
797
798 fs->set_prop (prop2, true);
838 } 799 }
839 800
840 fs->populate (res);
841 fs->set_prop (prop2);
842 } 801 }
843#else 802#else
844 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
845#endif 804#endif
846 } 805 }
847 806
848 if (parent[0]) 807 if (parent)
849 { 808 {
850 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
851 scr_remap_chars (); 810 scr_remap_chars ();
852 scr_touch (true); 811 scr_touch (true);
853 } 812 }
854 813
855 return true; 814 return true;
856} 815}
857 816
817void
858void rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
859{ 819{
860 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
861 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 823}
864 824
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
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 839{
867 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
868 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
869 842
870 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
872 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
873 846
874 free (s); 847 free (s);
875 free (ws); 848 free (ws);
… …
879/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
880/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
881void 854void
882rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
883{ 856{
884 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
885#if ENABLE_EWMH 858#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
887#endif 860#endif
888} 861}
889 862
890void 863void
891rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
892{ 865{
893 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
894#if ENABLE_EWMH 867#if ENABLE_EWMH
895 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
896#endif 869#endif
897} 870}
898 871
872void
873rxvt_term::set_window_color (int idx, const char *color)
874{
899#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
900void
901rxvt_term::set_window_color (int idx, const char *color)
902{
903 rxvt_color xcol; 876 rxvt_color xcol;
904 int i; 877
905
906 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
907 return; 879 return;
908 880
909 color = strdup (color); 881 color = strdup (color);
910 allocated.push_back ((void *)color); 882 allocated.push_back ((void *)color);
911 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
912 884
913 /* handle color aliases */ 885 /* handle color aliases */
914 if (isdigit (*color)) 886 if (isdigit (*color))
915 { 887 {
916 i = atoi (color); 888 int i = atoi (color);
917 889
918 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
891 {
919 { /* bright colors */ 892 /* bright colors */
920 i -= 8;
921 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
922 goto done; 894 goto done;
923 } 895 }
924 896
925 if (i >= 0 && i <= 7) 897 if (i >= 0 && i <= 7)
898 {
926 { /* normal colors */ 899 /* normal colors */
927 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
928 goto done; 901 goto done;
929 } 902 }
930 } 903 }
931 904
… …
936 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
937 */ 910 */
938 911
939 pix_colors_focused[idx] = xcol; 912 pix_colors_focused[idx] = xcol;
940 913
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 914done:
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 915 /*TODO: handle Color_BD, scrollbar background, etc. */
945 916
946 update_fade_color (idx); 917 update_fade_color (idx);
947 recolour_cursor (); 918 recolour_cursor ();
948 scr_recolour (); 919 scr_recolour ();
920#endif /* XTERM_COLOR_CHANGE */
949} 921}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */
954 922
955void 923void
956rxvt_term::recolour_cursor () 924rxvt_term::recolour_cursor ()
957{ 925{
958 XColor fg, bg; 926 XColor fg, bg;
… …
974 */ 942 */
975void 943void
976rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
977{ 945{
978 unsigned int i; 946 unsigned int i;
979 const char *xpmb = "\0"; 947 const char *xpmb = "";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
981 950
982 strcpy (fstr, "default");
983 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
986 { 953 {
987 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
988 break; 955 break;
989 } 956 }
990 957
991 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
993 { 960 {
994 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
995#ifdef XPM_BACKGROUND 962#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 963 xpmb = "default;";
997#endif 964#endif
998 break; 965 break;
999 } 966 }
1000 967
… …
1029 int old_width = szHint.width; 996 int old_width = szHint.width;
1030 int old_height = szHint.height; 997 int old_height = szHint.height;
1031 998
1032 window_calc (newwidth, newheight); 999 window_calc (newwidth, newheight);
1033 1000
1034 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);
1035 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1008 szHint.flags |= PBaseSize | PResizeInc;
1009 }
1036 1010
1037 if (!ignoreparent) 1011 if (!ignoreparent)
1038 { 1012 {
1039#ifdef SMART_RESIZE 1013#ifdef SMART_RESIZE
1040 /* 1014 /*
… …
1044 int x, y, x1, y1; 1018 int x, y, x1, y1;
1045 int dx, dy; 1019 int dx, dy;
1046 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1047 Window unused_cr; 1021 Window unused_cr;
1048 1022
1049 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1050 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1051 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1052 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1053 /* 1027 /*
1054 * 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
1055 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1056 */ 1030 */
… …
1073 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1074 dy = 0; 1048 dy = 0;
1075 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1076 dy /= 2; 1050 dy /= 2;
1077 1051
1078 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1079 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1080#else 1054#else
1081 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1082#endif 1056#endif
1083 } 1057 }
1058
1059 if (set_hint)
1060 XSetWMNormalHints (dpy, parent, &szHint);
1084 1061
1085 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1086 1063
1087 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1088 { 1065 {
1089 if (scrollBar.state) 1066 if (scrollBar.state)
1090 { 1067 scrollBar.resize ();
1091 XMoveResizeWindow (dpy, scrollBar.win,
1092 window_sb_x, 0,
1093 scrollbar_TotalWidth (), szHint.height);
1094 resize_scrollbar ();
1095 }
1096 1068
1097 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1098 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1099 width, height); 1071 width, height);
1100 1072
1101 scr_clear (); 1073#ifdef HAVE_BG_PIXMAP
1102#ifdef XPM_BACKGROUND 1074 if (bg_window_size_sensitive ())
1103 resize_pixmap (); 1075 update_background ();
1104#endif 1076#endif
1105 } 1077 }
1106 1078
1107 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1108 scr_reset (); 1080 scr_reset ();
1109
1110 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1111 //scr_touch (false);
1112
1113#ifdef XPM_BACKGROUND
1114 if (pixmap)
1115 scr_touch (false);
1116#endif
1117 1081
1118#ifdef USE_XIM 1082#ifdef USE_XIM
1119 IMSetPosition (); 1083 IMSetPosition ();
1120#endif 1084#endif
1121} 1085}
… …
1187 1151
1188/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1189bool 1153bool
1190rxvt_term::IMisRunning () 1154rxvt_term::IMisRunning ()
1191{ 1155{
1192 char *p;
1193 Atom atom; 1156 Atom atom;
1194 Window win; 1157 Window win;
1195 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1196 1159
1197 /* get current locale modifier */ 1160 /* get current locale modifier */
1198 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1161 if (char *p = XSetLocaleModifiers (0))
1199 { 1162 {
1200 strcpy (server, "@server="); 1163 strcpy (server, "@server=");
1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1164 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1202 1165
1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1166 if (p = strchr (server + 1, '@')) /* first one only */
1204 *p = '\0'; 1167 *p = '\0';
1205 1168
1206 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1207 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1208 1171
1209 if (win != None) 1172 if (win != None)
1210 return True; 1173 return true;
1211 } 1174 }
1212 1175
1213 return False; 1176 return false;
1214} 1177}
1215 1178
1216void 1179void
1217rxvt_term::IMSendSpot () 1180rxvt_term::IMSendSpot ()
1218{ 1181{
… …
1275 1238
1276 term->make_current (); 1239 term->make_current ();
1277 1240
1278 if (text) 1241 if (text)
1279 { 1242 {
1280 void *str; 1243 wchar_t *str;
1281 1244
1282 if (!text->encoding_is_wchar && text->string.multi_byte) 1245 if (!text->encoding_is_wchar && text->string.multi_byte)
1283 { 1246 {
1284 // of course, X makes it ugly again 1247 // of course, X makes it ugly again
1285 if (term->rs[Rs_imLocale]) 1248 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->rs[Rs_imLocale]); 1249 SET_LOCALE (term->rs[Rs_imLocale]);
1287 1250
1288 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1251 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1289 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1252 mbstowcs (str, text->string.multi_byte, text->length + 1);
1290 1253
1291 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->locale); 1255 SET_LOCALE (term->locale);
1293 } 1256 }
1294 else 1257 else
1295 str = (void *)text->string.wide_char; 1258 str = text->string.wide_char;
1296 1259
1297 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1260 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1298 DT_INT, call_data->caret, 1261 DT_INT, call_data->caret,
1299 DT_INT, call_data->chg_first, 1262 DT_INT, call_data->chg_first,
1300 DT_INT, call_data->chg_length, 1263 DT_INT, call_data->chg_length,
1301 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1264 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1338 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1339 unsigned long fg, bg; 1302 unsigned long fg, bg;
1340 const char *p; 1303 const char *p;
1341 char **s; 1304 char **s;
1342 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1343#ifdef ENABLE_XIM_ONTHESPOT
1344 XIMCallback xcb[4];
1345#endif
1346 1306
1347 set_environ (envv); 1307 set_environ (envv);
1348 1308
1349 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1350 return false; 1310 return false;
… …
1371 p = pet[pi]; 1331 p = pet[pi];
1372 1332
1373 if (!p) 1333 if (!p)
1374 continue; 1334 continue;
1375 1335
1376 s = rxvt_splitcommastring (p); 1336 s = rxvt_strsplit (',', p);
1377 1337
1378 for (i = found = 0; !found && s[i]; i++) 1338 for (i = found = 0; !found && s[i]; i++)
1379 { 1339 {
1380 if (!strcmp (s[i], "OverTheSpot")) 1340 if (!strcmp (s[i], "OverTheSpot"))
1381 input_style = XIMPreeditPosition | XIMStatusNothing; 1341 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1393 input_style = XIMPreeditNothing | XIMStatusNothing; 1353 input_style = XIMPreeditNothing | XIMStatusNothing;
1394 1354
1395 for (j = 0; j < xim_styles->count_styles; j++) 1355 for (j = 0; j < xim_styles->count_styles; j++)
1396 if (input_style == xim_styles->supported_styles[j]) 1356 if (input_style == xim_styles->supported_styles[j])
1397 { 1357 {
1398 rxvt_freecommastring (s); 1358 rxvt_free_strsplit (s);
1399 1359
1400 found = 1; 1360 found = 1;
1401 goto foundpet; 1361 goto foundpet;
1402 } 1362 }
1403 1363
1404 } 1364 }
1405 1365
1406 rxvt_freecommastring (s); 1366 rxvt_free_strsplit (s);
1407 } 1367 }
1408 1368
1409foundpet: 1369foundpet:
1410 1370
1411 XFree (xim_styles); 1371 XFree (xim_styles);
… …
1490 NULL); 1450 NULL);
1491 } 1451 }
1492#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1493 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1494 { 1454 {
1455 XIMCallback xcb[4];
1456
1495 im_set_position (spot); 1457 im_set_position (spot);
1496 1458
1497 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;
1498 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;
1499 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;
… …
1514#endif 1476#endif
1515 1477
1516 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1480 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1520 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1521 preedit_attr, 1483 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1485 status_attr, NULL);
1524 1486
… …
1567 p = rs[Rs_inputMethod]; 1529 p = rs[Rs_inputMethod];
1568 if (p && *p) 1530 if (p && *p)
1569 { 1531 {
1570 bool found = false; 1532 bool found = false;
1571 1533
1572 s = rxvt_splitcommastring (p); 1534 s = rxvt_strsplit (',', p);
1573 1535
1574 for (i = 0; s[i]; i++) 1536 for (i = 0; s[i]; i++)
1575 { 1537 {
1576 if (*s[i]) 1538 if (*s[i])
1577 { 1539 {
… …
1583 break; 1545 break;
1584 } 1546 }
1585 } 1547 }
1586 } 1548 }
1587 1549
1588 rxvt_freecommastring (s); 1550 rxvt_free_strsplit (s);
1589 1551
1590 if (found) 1552 if (found)
1591 goto done; 1553 goto done;
1592 } 1554 }
1593 1555
… …
1620 1582
1621 if (input_style & XIMPreeditPosition) 1583 if (input_style & XIMPreeditPosition)
1622 { 1584 {
1623 im_set_size (preedit_rect); 1585 im_set_size (preedit_rect);
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1586 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625 1587
1626 XSetICValues (Input_Context, 1588 XSetICValues (Input_Context,
1627 XNPreeditAttributes, preedit_attr, NULL); 1589 XNPreeditAttributes, preedit_attr, NULL);
1628 } 1590 }
1629 else 1591 else
1630 { 1592 {
… …
1647 XFree (status_attr); 1609 XFree (status_attr);
1648 } 1610 }
1649 1611
1650 XFree (preedit_attr); 1612 XFree (preedit_attr);
1651} 1613}
1652#endif /* USE_XIM */ 1614#endif /* USE_XIM */
1615
1616void
1617rxvt_term::get_window_origin (int &x, int &y)
1618{
1619 Window cr;
1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1621}
1622
1623Pixmap
1624rxvt_term::get_pixmap_property (Atom property)
1625{
1626 Pixmap pixmap = None;
1627
1628 int aformat;
1629 unsigned long nitems, bytes_after;
1630 Atom atype;
1631 unsigned char *prop;
1632 int result = XGetWindowProperty (dpy, display->root, property,
1633 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1634 &nitems, &bytes_after, &prop);
1635 if (result == Success)
1636 {
1637 if (atype == XA_PIXMAP)
1638 pixmap = *(Pixmap *)prop;
1639 XFree (prop);
1640 }
1641
1642 return pixmap;
1643}
1644
1645#ifdef HAVE_BG_PIXMAP
1646
1647void
1648rxvt_term::update_background ()
1649{
1650 if (update_background_ev.is_active ())
1651 return;
1652
1653 bg_invalidate ();
1654
1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1656
1657 if (to_wait <= 0.)
1658 bg_render ();
1659 else
1660 update_background_ev.start (to_wait);
1661}
1662
1663void
1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1665{
1666 make_current ();
1667
1668 update_background_ev.stop ();
1669 bg_render ();
1670 refresh_check ();
1671}
1672
1673#endif /* HAVE_BG_PIXMAP */
1653 1674
1654/*----------------------- end-of-file (C source) -----------------------*/ 1675/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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