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.188 by root, Wed Jan 18 08:33:34 2006 UTC vs.
Revision 1.306 by ayin, Mon Feb 18 09:58:04 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
56// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term;
58
53static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
54 60
55bool 61bool
56rxvt_set_locale (const char *locale) 62rxvt_set_locale (const char *locale) NOTHROW
57{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
58 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 70 return false;
60 71
61 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
63 return true; 74 return true;
64} 75}
65 76
66void 77void
67rxvt_push_locale (const char *locale) 78rxvt_push_locale (const char *locale) NOTHROW
68{ 79{
69 strcpy (savelocale, curlocale); 80 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 81 rxvt_set_locale (locale);
71} 82}
72 83
73void 84void
74rxvt_pop_locale () 85rxvt_pop_locale () NOTHROW
75{ 86{
76 rxvt_set_locale (savelocale); 87 rxvt_set_locale (savelocale);
77} 88}
78 89
79#if ENABLE_COMBINING 90#if ENABLE_COMBINING
80class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
81 92
82text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
83{ 94{
84 compose_char *cc; 95 compose_char *cc;
85 96
86 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
87 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
88 cc = (*this)[c1]; 99 cc = (*this)[c1];
89 while (cc) 100 while (cc)
90 { 101 {
… …
139 150
140} 151}
141#endif 152#endif
142 153
143rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
144 : 155{
145#if TRANSPARENT 156#if HAVE_BG_PIXMAP
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 158#endif
151#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
153#endif 161#endif
154#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
155 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
156#endif 164#endif
157#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
158 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
159#endif 167#endif
160#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
161 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
162#endif 170#endif
163#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
164 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
165#endif 180#endif
166#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
167 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
168#endif 183#endif
169#ifdef USE_XIM 184#ifndef NO_BELL
170 im_ev (this, &rxvt_term::im_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
171#endif 186#endif
172 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
173 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
174 check_ev (this, &rxvt_term::check_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
175 flush_ev (this, &rxvt_term::flush_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
176 destroy_ev (this, &rxvt_term::destroy_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
177 pty_ev (this, &rxvt_term::pty_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
178 incr_ev (this, &rxvt_term::incr_cb) 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
179{ 194
180 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
181 196
182 termlist.push_back (this); 197 termlist.push_back (this);
183 198
184#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 201#endif
190} 202}
191 203
192// 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.
193// for use before an emergency exit 205// for use before an emergency exit
206void
194void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
195{ 208{
196 if (cmd_pid) 209 if (cmd_pid)
197 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
198 211
212 pty_ev.stop ();
199 delete pty; pty = 0; 213 delete pty; pty = 0;
200} 214}
201 215
202rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
203{ 217{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 219
208 emergency_cleanup (); 220 emergency_cleanup ();
209 221
210#if ENABLE_STYLES 222#if ENABLE_STYLES
… …
212 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
213 delete fontset[i]; 225 delete fontset[i];
214#endif 226#endif
215 delete fontset[0]; 227 delete fontset[0];
216 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
217 if (display) 233 if (display)
218 { 234 {
219 dDisp;
220
221 selection_clear (); 235 selection_clear ();
222 236
223#ifdef USE_XIM 237#ifdef USE_XIM
224 im_destroy (); 238 im_destroy ();
225#endif 239#endif
226#ifdef XTERM_SCROLLBAR 240#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 243#endif
230#ifdef PLAIN_SCROLLBAR 244#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 246#endif
233#ifdef NEXT_SCROLLBAR 247#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 248 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 249 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 250 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 251 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 252 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 253 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 254 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 255 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 258#endif
245#ifdef RXVT_SCROLLBAR 259#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 263#endif
250 if (gc) XFreeGC (disp, gc); 264 if (gc) XFreeGC (dpy, gc);
251 265
252 delete drawable; 266 delete drawable;
253 // destroy all windows 267 // destroy all windows
254 if (parent[0]) 268 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 269 XDestroyWindow (dpy, parent[0]);
256 }
257 270
258 // TODO: free pixcolours, colours should become part of rxvt_display 271 for (int i = 0; i < TOTAL_COLORS; i++)
259 delete pix_colors_focused; 272 if (ISSET_PIXCOLOR (i))
273 {
274 pix_colors_focused [i].free (this);
260#if OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
261 delete pix_colors_unfocused; 276 pix_colors_unfocused [i].free (this);
262#endif 277#endif
278 }
263 279
280 clear ();
281
282 display->flush (); /* ideally .put should do this */
264 displays.put (display); 283 displays.put (display);
284 }
265 285
266 scr_release (); 286 scr_release ();
267 287
268 /* clear all resources */ 288 /* clear all resources */
269 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 290 free (allocated [i]);
271 291
272 free (selection.text); 292 free (selection.text);
273 // TODO: manage env vars in child only(!) 293 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 294 free (env_display);
276 free (env_term); 295 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 296 free (locale);
279 free (v_buffer); 297 free (v_buffer);
280 free (incr_buf); 298 free (incr_buf);
281 299
282 delete envv; 300 delete envv;
283 delete argv; 301 delete argv;
284 302
285#ifdef KEYSYM_RESOURCE 303#ifdef KEYSYM_RESOURCE
286 delete keyboard; 304 delete keyboard;
287#endif 305#endif
306#ifndef NO_RESOURCES
307 XrmDestroyDatabase (option_db);
308#endif
288} 309}
289 310
311// child has exited, usually destroys
290void 312void
291rxvt_term::child_exit () 313rxvt_term::child_cb (ev::child &w, int status)
292{ 314{
315 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
316
293 cmd_pid = 0; 317 cmd_pid = 0;
294 318
295 if (!OPTION (Opt_hold)) 319 if (!option (Opt_hold))
296 destroy (); 320 destroy ();
297} 321}
298 322
299void 323void
300rxvt_term::destroy () 324rxvt_term::destroy ()
301{ 325{
302 if (destroy_ev.active) 326 if (destroy_ev.is_active ())
303 return; 327 return;
328
329 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
304 330
305#if ENABLE_OVERLAY 331#if ENABLE_OVERLAY
306 scr_overlay_off (); 332 scr_overlay_off ();
307#endif 333#endif
308 334
309 if (display) 335 if (display)
310 { 336 {
311#if USE_XIM 337#if USE_XIM
312 im_ev.stop (display); 338 im_ev.stop (display);
313#endif 339#endif
314#if HAVE_SCROLLBARS
315 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
316#endif 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
317#if TRANSPARENT
318 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
319#endif 343#endif
320 incr_ev.stop (); 344 incr_ev.stop ();
321 termwin_ev.stop (display); 345 termwin_ev.stop (display);
322 vt_ev.stop (display); 346 vt_ev.stop (display);
323 } 347 }
324 348
325 check_ev.stop (); 349 flush_ev.stop ();
326 pty_ev.stop (); 350 pty_ev.stop ();
327#ifdef CURSOR_BLINK 351#ifdef CURSOR_BLINK
328 cursor_blink_ev.stop (); 352 cursor_blink_ev.stop ();
329#endif 353#endif
330#ifdef TEXT_BLINK 354#ifdef TEXT_BLINK
… …
338#endif 362#endif
339#ifdef POINTER_BLANK 363#ifdef POINTER_BLANK
340 pointer_ev.stop (); 364 pointer_ev.stop ();
341#endif 365#endif
342 366
343 destroy_ev.start (0); 367 destroy_ev.start ();
344} 368}
345 369
346void 370void
347rxvt_term::destroy_cb (time_watcher &w) 371rxvt_term::destroy_cb (ev::idle &w, int revents)
348{ 372{
349 make_current (); 373 make_current ();
350 374
351 delete this; 375 delete this;
352} 376}
… …
363{ 387{
364 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
366} 390}
367 391
368#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
369static void 393static void
370print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
371{ 395{
372 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
373 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
… …
406 else 430 else
407 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
408 mesg, BUFSIZ); 432 mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
410 } 434 }
411 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
412 mesg, BUFSIZ); 436 mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
414} 438}
415#endif 439#endif
416 440
… …
421 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
422 else 446 else
423 { 447 {
424 // GET_R is most likely not the terminal which caused the error, 448 // GET_R is most likely not the terminal which caused the error,
425 // so just output the error and continue 449 // so just output the error and continue
426#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
427 print_x_error (display, event); 453 print_x_error (display, event);
428#else
429 old_xerror_handler (display, event);
430#endif 454#endif
431 } 455 }
432 456
433 return 0; 457 return 0;
434} 458}
… …
440 DisplayString (display)); 464 DisplayString (display));
441 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
442 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
443} 467}
444 468
445/*----------------------------------------------------------------------*/
446bool
447rxvt_term::init (int argc, const char *const *argv)
448{
449 SET_R (this);
450 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :(
452
453 if (!init_vars ())
454 return false;
455
456 init_secondary ();
457
458 const char **cmd_argv = init_resources (argc, argv);
459
460#ifdef KEYSYM_RESOURCE
461 keyboard->register_done ();
462#endif
463
464#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */
467#endif
468
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483
484 create_windows (argc, argv);
485
486 dDisp;
487
488 init_xlocale ();
489
490 scr_reset (); // initialize screen
491
492#if 0
493 XSynchronize (disp, True);
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */
499#endif
500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent))
502 {
503 XSelectInput (disp, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root);
506 }
507#endif
508
509 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]);
511
512 set_colorfgbg ();
513
514 init_command (cmd_argv);
515
516 free (cmd_argv);
517
518 if (pty->pty >= 0)
519 pty_ev.start (pty->pty, EVENT_READ);
520
521 check_ev.start ();
522
523 HOOK_INVOKE ((this, HOOK_START, DT_END));
524
525 return true;
526}
527
528static struct sig_handlers 469static struct sig_handlers
529{ 470{
530 sig_watcher sw_chld, sw_term, sw_int; 471 ev::sig sw_term, sw_int;
531
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545 472
546 /* 473 /*
547 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
548 */ 475 */
549 void 476 void sig_term (ev::sig &w, int revents);
550 sig_term (sig_watcher &w) 477
478 sig_handlers ()
551 { 479 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum);
558 }
559
560 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
563 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
564 {
565 } 482 }
566} sig_handlers; 483} sig_handlers;
567 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
568char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
569 494
570void 495void
571rxvt_init () 496rxvt_init ()
572{ 497{
573 uid_t uid = getuid (); 498 ptytty::init ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || gid != getegid ())
580 {
581#if PTYTTY_HELPER
582 rxvt_ptytty_server ();
583#else
584 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
586 499
587 // drop privileges 500 if (!ev_default_loop (0))
588#if HAVE_SETRESUID 501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
589 setresgid (gid, gid, gid);
590 setresuid (uid, uid, uid);
591#elif HAVE_SETREUID
592 setregid (gid, gid);
593 setreuid (uid, uid);
594#elif HAVE_SETUID
595 setgid (gid);
596 setuid (uid);
597#endif
598
599 if (uid != geteuid ()
600 || gid != getegid ())
601 rxvt_fatal ("unable to drop privileges, aborting.\n");
602 }
603 502
604 rxvt_environ = environ; 503 rxvt_environ = environ;
605 504
606 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
607 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
608 507
609 sig_handlers.sw_chld.start (SIGCHLD);
610 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
611 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
612 510
613 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
614 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
615 513
616 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
618 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
619 517
620 XrmInitialize (); 518 XrmInitialize ();
621} 519}
622 520
623/* ------------------------------------------------------------------------- *
624 * MEMORY ALLOCATION WRAPPERS *
625 * ------------------------------------------------------------------------- */
626void *
627rxvt_malloc (size_t size)
628{
629 void *p = malloc (size);
630
631 if (!p)
632 rxvt_fatal ("memory allocation failure. aborting.\n");
633
634 return p;
635}
636
637void *
638rxvt_calloc (size_t number, size_t size)
639{
640 void *p = calloc (number, size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648void *
649rxvt_realloc (void *ptr, size_t size)
650{
651 void *p = realloc (ptr, size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
660/* 522/*
661 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
662 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
663 */ 525 */
664void 526void
665rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
666{ 528{
667 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
668 int x, y, sb_w, flags; 530 int x, y, flags;
669 unsigned int w, h; 531 unsigned int w, h;
670 unsigned int max_width, max_height; 532 unsigned int max_width, max_height;
671 dDisp;
672
673 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
674 ncol, nrow, szHint.width, szHint.height));
675 533
676 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
677 szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
678 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 536 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
679 537
… …
734 max_width = MAX_COLS * fwidth; 592 max_width = MAX_COLS * fwidth;
735 max_height = MAX_ROWS * fheight; 593 max_height = MAX_ROWS * fheight;
736 594
737 szHint.base_width = szHint.base_height = 2 * int_bwidth; 595 szHint.base_width = szHint.base_height = 2 * int_bwidth;
738 596
739 sb_w = 0;
740 window_vt_x = window_vt_y = int_bwidth; 597 window_vt_x = window_vt_y = int_bwidth;
741 598
742 if (scrollBar.state) 599 if (scrollBar.state)
743 { 600 {
744 sb_w = scrollbar_TotalWidth (); 601 int sb_w = scrollBar.total_width ();
745 szHint.base_width += sb_w; 602 szHint.base_width += sb_w;
603
746 if (!OPTION (Opt_scrollBar_right)) 604 if (!option (Opt_scrollBar_right))
747 window_vt_x += sb_w; 605 window_vt_x += sb_w;
748 } 606 }
749 607
750 szHint.width_inc = fwidth; 608 szHint.width_inc = fwidth;
751 szHint.height_inc = fheight; 609 szHint.height_inc = fheight;
752 szHint.min_width = szHint.base_width + szHint.width_inc; 610 szHint.min_width = szHint.base_width + szHint.width_inc;
753 szHint.min_height = szHint.base_height + szHint.height_inc; 611 szHint.min_height = szHint.base_height + szHint.height_inc;
754 612
755 if (newwidth && newwidth - szHint.base_width < max_width) 613 if (newwidth && newwidth - szHint.base_width < max_width)
756 { 614 {
757 szHint.width = newwidth; 615 szHint.width = newwidth;
… …
772 { 630 {
773 min_it (height, max_height); 631 min_it (height, max_height);
774 szHint.height = szHint.base_height + height; 632 szHint.height = szHint.base_height + height;
775 } 633 }
776 634
777 if (scrollBar.state && OPTION (Opt_scrollBar_right))
778 window_sb_x = szHint.width - sb_w;
779
780 if (recalc_x) 635 if (recalc_x)
781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
637
782 if (recalc_y) 638 if (recalc_y)
783 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 639 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
784 640
785 ncol = width / fwidth; 641 ncol = width / fwidth;
786 nrow = height / fheight; 642 nrow = height / fheight;
787 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
788 ncol, nrow, szHint.width,
789 szHint.height));
790 return;
791} 643}
792 644
793/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
794/* 646/*
795 * Tell the teletype handler what size the window is. 647 * Tell the teletype handler what size the window is.
… …
808 ws.ws_xpixel = width; 660 ws.ws_xpixel = width;
809 ws.ws_ypixel = height; 661 ws.ws_ypixel = height;
810 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 662 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
811 663
812#if 0 664#if 0
813 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 665 // TIOCSWINSZ is supposed to do this automatically and correctly
814 if (cmd_pid) /* force through to the command */ 666 if (cmd_pid) /* force through to the command */
815 kill (-cmd_pid, SIGWINCH); 667 kill (-cmd_pid, SIGWINCH);
816#endif 668#endif
817} 669}
818 670
… …
847 delete fontset[0]; 699 delete fontset[0];
848 fontset[0] = fs; 700 fontset[0] = fs;
849 701
850 prop = (*fs)[1]->properties (); 702 prop = (*fs)[1]->properties ();
851 prop.height += lineSpace; 703 prop.height += lineSpace;
704
852 fs->set_prop (prop); 705 fs->set_prop (prop, false);
853 706
854 fwidth = prop.width; 707 fwidth = prop.width;
855 fheight = prop.height; 708 fheight = prop.height;
856 fbase = prop.ascent; 709 fbase = prop.ascent;
857 710
… …
866 { 719 {
867 fontset[style] = fs = new rxvt_fontset (this); 720 fontset[style] = fs = new rxvt_fontset (this);
868 rxvt_fontprop prop2 = prop; 721 rxvt_fontprop prop2 = prop;
869 722
870 if (res) 723 if (res)
871 prop2.weight = prop2.slant = rxvt_fontprop::unset; 724 {
725 fs->populate (res);
726 fs->set_prop (prop2, false);
727 }
872 else 728 else
873 { 729 {
874 res = fontset[0]->fontdesc; 730 fs->populate (fontset[0]->fontdesc);
875 731
876 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 732 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
877 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 733 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
734
735 fs->set_prop (prop2, true);
878 } 736 }
879 737
880 fs->populate (res);
881 fs->set_prop (prop2);
882 } 738 }
883#else 739#else
884 fontset[style] = fontset[0]; 740 fontset[style] = fontset[0];
885#endif 741#endif
886 } 742 }
… …
888 if (parent[0]) 744 if (parent[0])
889 { 745 {
890 resize_all_windows (0, 0, 0); 746 resize_all_windows (0, 0, 0);
891 scr_remap_chars (); 747 scr_remap_chars ();
892 scr_touch (true); 748 scr_touch (true);
893 } 749 }
894 750
895 return true; 751 return true;
896} 752}
897 753
754void
898void rxvt_term::set_string_property (Atom prop, const char *str, int len) 755rxvt_term::set_string_property (Atom prop, const char *str, int len)
899{ 756{
900 XChangeProperty (display->display, parent[0], 757 XChangeProperty (dpy, parent[0],
901 prop, XA_STRING, 8, PropModeReplace, 758 prop, XA_STRING, 8, PropModeReplace,
902 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 759 (const unsigned char *)str, len >= 0 ? len : strlen (str));
903} 760}
904 761
762void
905void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 763rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
906{ 764{
907 wchar_t *ws = rxvt_mbstowcs (str, len); 765 wchar_t *ws = rxvt_mbstowcs (str, len);
908 char *s = rxvt_wcstoutf8 (ws); 766 char *s = rxvt_wcstoutf8 (ws);
909 767
910 XChangeProperty (display->display, parent[0], 768 XChangeProperty (dpy, parent[0],
911 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 769 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
912 (const unsigned char *)s, strlen (s)); 770 (const unsigned char *)s, strlen (s));
913 771
914 free (s); 772 free (s);
915 free (ws); 773 free (ws);
… …
934#if ENABLE_EWMH 792#if ENABLE_EWMH
935 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 793 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
936#endif 794#endif
937} 795}
938 796
797void
798rxvt_term::set_window_color (int idx, const char *color)
799{
939#ifdef XTERM_COLOR_CHANGE 800#ifdef XTERM_COLOR_CHANGE
940void
941rxvt_term::set_window_color (int idx, const char *color)
942{
943 rxvt_color xcol; 801 rxvt_color xcol;
944 int i;
945 802
946 if (color == NULL || *color == '\0') 803 if (color == NULL || *color == '\0')
947 return; 804 return;
948 805
806 color = strdup (color);
807 allocated.push_back ((void *)color);
808 rs[Rs_color + idx] = color;
809
949 /* handle color aliases */ 810 /* handle color aliases */
950 if (isdigit (*color)) 811 if (isdigit (*color))
951 { 812 {
952 i = atoi (color); 813 int i = atoi (color);
953 814
954 if (i >= 8 && i <= 15) 815 if (i >= 8 && i <= 15)
816 {
955 { /* bright colors */ 817 /* bright colors */
956 i -= 8;
957 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 818 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
958 SET_PIXCOLOR (idx);
959 goto done; 819 goto done;
960 } 820 }
961 821
962 if (i >= 0 && i <= 7) 822 if (i >= 0 && i <= 7)
823 {
963 { /* normal colors */ 824 /* normal colors */
964 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 825 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
965 SET_PIXCOLOR (idx);
966 goto done; 826 goto done;
967 } 827 }
968 } 828 }
969 829
970 if (!rXParseAllocColor (&xcol, color)) 830 set_color (xcol, color);
971 return;
972
973 /* XStoreColor (display->display, display->cmap, XColor*); */
974 831
975 /* 832 /*
976 * FIXME: should free colors here, but no idea how to do it so instead, 833 * FIXME: should free colors here, but no idea how to do it so instead,
977 * so just keep gobbling up the colormap 834 * so just keep gobbling up the colormap
978 */ 835 */
979# if 0
980 for (i = Color_Black; i <= Color_White; i++)
981 if (pix_colors[idx] == pix_colors[i])
982 break;
983 if (i > Color_White)
984 {
985 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
986 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
987 DisplayPlanes (display->display, display->screen));
988 }
989# endif
990 836
991 pix_colors_focused[idx] = xcol; 837 pix_colors_focused[idx] = xcol;
992 SET_PIXCOLOR (idx);
993 838
994 /* XSetWindowAttributes attr; */
995 /* Cursor cursor; */
996done: 839done:
997
998#if OFF_FOCUS_FADING
999 if (rs[Rs_fade])
1000 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1001#endif
1002
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 840 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 841
842 update_fade_color (idx);
1005 recolour_cursor (); 843 recolour_cursor ();
1006 scr_recolour (); 844 scr_recolour ();
845#endif /* XTERM_COLOR_CHANGE */
1007} 846}
1008
1009#else
1010# define set_window_color (idx,color) ((void)0)
1011#endif /* XTERM_COLOR_CHANGE */
1012 847
1013void 848void
1014rxvt_term::recolour_cursor () 849rxvt_term::recolour_cursor ()
1015{ 850{
1016 XColor xcol[2]; 851 XColor fg, bg;
1017 852
1018 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 853 (ISSET_PIXCOLOR (Color_pointer_fg)
1019 ? pix_colors_focused[Color_pointer_fg] 854 ? pix_colors_focused[Color_pointer_fg]
1020 : pix_colors_focused[Color_fg]; 855 : pix_colors_focused[Color_fg]).get (fg);
856
1021 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 857 (ISSET_PIXCOLOR (Color_pointer_bg)
1022 ? pix_colors_focused[Color_pointer_bg] 858 ? pix_colors_focused[Color_pointer_bg]
1023 : pix_colors_focused[Color_bg]; 859 : pix_colors_focused[Color_bg]).get (bg);
1024 860
1025 XQueryColors (display->display, display->cmap, xcol, 2); 861 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1026 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1027} 862}
1028 863
1029/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
1030/* 865/*
1031 * find if fg/bg matches any of the normal (low-intensity) colors 866 * find if fg/bg matches any of the normal (low-intensity) colors
1032 */ 867 */
1033void 868void
1034rxvt_term::set_colorfgbg () 869rxvt_term::set_colorfgbg ()
1035{ 870{
1036 unsigned int i; 871 unsigned int i;
1037 const char *xpmb = "\0"; 872 const char *xpmb = "";
1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 873 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1039 874
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1041 strcpy (fstr, "default"); 875 strcpy (fstr, "default");
1042 strcpy (bstr, "default"); 876 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 877 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_fg] == pix_colors[i]) 878 if (pix_colors[Color_fg] == pix_colors[i])
1045 { 879 {
… …
1049 883
1050 for (i = Color_Black; i <= Color_White; i++) 884 for (i = Color_Black; i <= Color_White; i++)
1051 if (pix_colors[Color_bg] == pix_colors[i]) 885 if (pix_colors[Color_bg] == pix_colors[i])
1052 { 886 {
1053 sprintf (bstr, "%d", (i - Color_Black)); 887 sprintf (bstr, "%d", (i - Color_Black));
1054#ifdef XPM_BACKGROUND 888#ifdef BG_IMAGE_FROM_FILE
1055 xpmb = "default;"; 889 xpmb = "default;";
1056#endif 890#endif
1057 break; 891 break;
1058 } 892 }
1059 893
1060 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 894 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1061} 895}
1062 896
1063/*----------------------------------------------------------------------*/ 897/*----------------------------------------------------------------------*/
1064 898
1065int 899bool
1066rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 900rxvt_term::set_color (rxvt_color &color, const char *name)
1067{ 901{
1068 if (!screen_in_out->set (display, colour)) 902 if (color.set (this, name))
1069 {
1070 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1071 return false;
1072 }
1073
1074 return true; 903 return true;
904
905 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
906 return false;
907}
908
909void
910rxvt_term::alias_color (int dst, int src)
911{
912 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1075} 913}
1076 914
1077/* -------------------------------------------------------------------- * 915/* -------------------------------------------------------------------- *
1078 * - WINDOW RESIZING - * 916 * - WINDOW RESIZING - *
1079 * -------------------------------------------------------------------- */ 917 * -------------------------------------------------------------------- */
1080void 918void
1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 919rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1082{ 920{
1083 int fix_screen; 921 int fix_screen;
1084 int old_width = szHint.width, old_height = szHint.height; 922 int old_width = szHint.width;
1085 dDisp; 923 int old_height = szHint.height;
1086 924
1087 window_calc (newwidth, newheight); 925 window_calc (newwidth, newheight);
926
927 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1088 XSetWMNormalHints (disp, parent[0], &szHint); 928 XSetWMNormalHints (dpy, parent[0], &szHint);
1089 929
1090 if (!ignoreparent) 930 if (!ignoreparent)
1091 { 931 {
1092#ifdef SMART_RESIZE 932#ifdef SMART_RESIZE
1093 /* 933 /*
… …
1097 int x, y, x1, y1; 937 int x, y, x1, y1;
1098 int dx, dy; 938 int dx, dy;
1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 939 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100 Window unused_cr; 940 Window unused_cr;
1101 941
1102 XTranslateCoordinates (disp, parent[0], display->root, 942 XTranslateCoordinates (dpy, parent[0], display->root,
1103 0, 0, &x, &y, &unused_cr); 943 0, 0, &x, &y, &unused_cr);
1104 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 944 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 945 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106 /* 946 /*
1107 * if display->root isn't the parent window, a WM will probably have offset 947 * if display->root isn't the parent window, a WM will probably have offset
1108 * our position for handles and decorations. Counter it 948 * our position for handles and decorations. Counter it
1109 */ 949 */
… …
1111 { 951 {
1112 x -= x1; 952 x -= x1;
1113 y -= y1; 953 y -= y1;
1114 } 954 }
1115 955
1116 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 956 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1117 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 957 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1118 dx = old_width - szHint.width; 958 dx = old_width - szHint.width;
1119 dy = old_height - szHint.height; 959 dy = old_height - szHint.height;
1120 960
1121 /* Check position of the center of the window */ 961 /* Check position of the center of the window */
1122 if (x < x1) /* left half */ 962 if (x < x1) /* left half */
1123 dx = 0; 963 dx = 0;
… …
1126 if (y < y1) /* top half */ 966 if (y < y1) /* top half */
1127 dy = 0; 967 dy = 0;
1128 else if (y == y1) /* exact center */ 968 else if (y == y1) /* exact center */
1129 dy /= 2; 969 dy /= 2;
1130 970
1131 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 971 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1132 szHint.width, szHint.height); 972 szHint.width, szHint.height);
1133#else 973#else
1134 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 974 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1135#endif 975#endif
1136 } 976 }
1137 977
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 979
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 981 {
1142 if (scrollBar.state) 982 if (scrollBar.state)
1143 {
1144 XMoveResizeWindow (disp, scrollBar.win,
1145 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar (); 983 resize_scrollbar ();
1148 }
1149 984
1150 XMoveResizeWindow (disp, vt, 985 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1152 width, height); 987 width, height);
1153 988
989#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.window_size_sensitive ())
991 update_background ();
992#endif
993
1154 scr_clear (); 994 scr_clear ();
1155#ifdef XPM_BACKGROUND
1156 resize_pixmap ();
1157#endif
1158 } 995 }
1159 996
1160 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1161 {
1162 int curr_screen = -1;
1163 int old_ncol = prev_ncol;
1164
1165 /* scr_reset only works on the primary screen */
1166 if (old_height) /* this is not the first time through */
1167 {
1168 unsigned int ocol = ncol;
1169 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1170 curr_screen = scr_change_screen (PRIMARY);
1171 ncol = ocol;
1172 }
1173
1174 scr_reset (); 998 scr_reset ();
1175 999
1176 if (curr_screen >= 0) /* this is not the first time through */ 1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1177 { 1001 //scr_touch (false);
1178 scr_change_screen (curr_screen);
1179 selection_check (old_ncol != ncol ? 4 : 0);
1180 }
1181 }
1182 1002
1183 old_width = szHint.width; 1003#ifdef HAVE_BG_PIXMAP
1184 old_height = szHint.height; 1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1185 1005// if (bgPixmap.pixmap)
1186#ifdef XPM_BACKGROUND
1187 if (pixmap)
1188 scr_touch (false); 1006// scr_touch (false);
1189#endif 1007#endif
1190 1008
1191#ifdef USE_XIM 1009#ifdef USE_XIM
1192 IMSetStatusPosition (); 1010 IMSetPosition ();
1193#endif 1011#endif
1194} 1012}
1195 1013
1196/* 1014/*
1197 * Set the width/height of the vt window in characters. Units are pixels. 1015 * Set the width/height of the vt window in characters. Units are pixels.
… …
1202{ 1020{
1203 XWindowAttributes wattr; 1021 XWindowAttributes wattr;
1204 1022
1205 if (newwidth == 0 || newheight == 0) 1023 if (newwidth == 0 || newheight == 0)
1206 { 1024 {
1207 XGetWindowAttributes (display->display, display->root, &wattr); 1025 XGetWindowAttributes (dpy, display->root, &wattr);
1208 1026
1209 if (newwidth == 0) 1027 if (newwidth == 0)
1210 newwidth = wattr.width - szHint.base_width; 1028 newwidth = wattr.width - szHint.base_width;
1211 if (newheight == 0) 1029 if (newheight == 0)
1212 newheight = wattr.height - szHint.base_height; 1030 newheight = wattr.height - szHint.base_height;
… …
1226#ifdef USE_XIM 1044#ifdef USE_XIM
1227 1045
1228void 1046void
1229rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1047rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1230{ 1048{
1231 fg = pix_colors[Color_fg]; 1049 fg = pix_colors [Color_fg];
1232 bg = pix_colors[Color_bg]; 1050 bg = pix_colors [Color_bg];
1233} 1051}
1234 1052
1235void 1053void
1236rxvt_term::im_set_size (XRectangle &size) 1054rxvt_term::im_set_size (XRectangle &size)
1237{ 1055{
… …
1274 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1092 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1275 1093
1276 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1094 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1277 *p = '\0'; 1095 *p = '\0';
1278 1096
1279 atom = XInternAtom (display->display, server, False); 1097 atom = XInternAtom (dpy, server, False);
1280 win = XGetSelectionOwner (display->display, atom); 1098 win = XGetSelectionOwner (dpy, atom);
1281 1099
1282 if (win != None) 1100 if (win != None)
1283 return True; 1101 return True;
1284 } 1102 }
1285 1103
… …
1292 XPoint nspot; 1110 XPoint nspot;
1293 XVaNestedList preedit_attr; 1111 XVaNestedList preedit_attr;
1294 1112
1295 if (!Input_Context 1113 if (!Input_Context
1296 || !focus 1114 || !focus
1297 || !(input_style & XIMPreeditPosition)) 1115 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1298 return; 1116 return;
1299 1117
1300 im_set_position (nspot); 1118 im_set_position (nspot);
1301 1119
1302 if (nspot.x == spot.x && nspot.y == spot.y) 1120 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1321 input_method = 0; 1139 input_method = 0;
1322 } 1140 }
1323 1141
1324 Input_Context = 0; 1142 Input_Context = 0;
1325} 1143}
1144
1145#ifdef ENABLE_XIM_ONTHESPOT
1146
1147static void
1148xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1149{
1150 ((rxvt_term *)client_data)->make_current ();
1151 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1152}
1153
1154static void
1155xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1156{
1157 ((rxvt_term *)client_data)->make_current ();
1158 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1159}
1160
1161static void
1162xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1163{
1164 rxvt_term *term = (rxvt_term *)client_data;
1165 XIMText *text = call_data->text;
1166
1167 term->make_current ();
1168
1169 if (text)
1170 {
1171 void *str;
1172
1173 if (!text->encoding_is_wchar && text->string.multi_byte)
1174 {
1175 // of course, X makes it ugly again
1176 if (term->rs[Rs_imLocale])
1177 SET_LOCALE (term->rs[Rs_imLocale]);
1178
1179 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1180 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1181
1182 if (term->rs[Rs_imLocale])
1183 SET_LOCALE (term->locale);
1184 }
1185 else
1186 str = (void *)text->string.wide_char;
1187
1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1189 DT_INT, call_data->caret,
1190 DT_INT, call_data->chg_first,
1191 DT_INT, call_data->chg_length,
1192 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1193 DT_WCS_LEN, str, str ? (int)text->length : 0,
1194 DT_END));
1195 }
1196 else
1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198 DT_INT, call_data->caret,
1199 DT_INT, call_data->chg_first,
1200 DT_INT, call_data->chg_length,
1201 DT_END));
1202}
1203
1204#if 0
1205static void
1206xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1207{
1208 ((rxvt_term *)client_data)->make_current ();
1209 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1210 DT_INT, call_data->position,
1211 DT_INT, call_data->direction,
1212 DT_INT, call_data->style,
1213 DT_END));
1214}
1215#endif
1216
1217#endif
1326 1218
1327/* 1219/*
1328 * Try to open a XIM with the current modifiers, then see if we can 1220 * Try to open a XIM with the current modifiers, then see if we can
1329 * open a suitable preedit type 1221 * open a suitable preedit type
1330 */ 1222 */
… …
1337 XRectangle rect, status_rect, needed_rect; 1229 XRectangle rect, status_rect, needed_rect;
1338 unsigned long fg, bg; 1230 unsigned long fg, bg;
1339 const char *p; 1231 const char *p;
1340 char **s; 1232 char **s;
1341 XIMStyles *xim_styles; 1233 XIMStyles *xim_styles;
1234#ifdef ENABLE_XIM_ONTHESPOT
1235 XIMCallback xcb[4];
1236#endif
1342 1237
1343 set_environ (envv); 1238 set_environ (envv);
1344 1239
1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1240 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1346 return false; 1241 return false;
1347 1242
1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1349 input_method = display->get_xim (locale, modifiers); 1243 input_method = display->get_xim (locale, modifiers);
1350 if (input_method == NULL) 1244 if (input_method == NULL)
1351 return false; 1245 return false;
1352 1246
1353 xim = input_method->xim; 1247 xim = input_method->xim;
… …
1373 s = rxvt_splitcommastring (p); 1267 s = rxvt_splitcommastring (p);
1374 1268
1375 for (i = found = 0; !found && s[i]; i++) 1269 for (i = found = 0; !found && s[i]; i++)
1376 { 1270 {
1377 if (!strcmp (s[i], "OverTheSpot")) 1271 if (!strcmp (s[i], "OverTheSpot"))
1378 input_style = (XIMPreeditPosition | XIMStatusNothing); 1272 input_style = XIMPreeditPosition | XIMStatusNothing;
1379 else if (!strcmp (s[i], "OffTheSpot")) 1273 else if (!strcmp (s[i], "OffTheSpot"))
1380 input_style = (XIMPreeditArea | XIMStatusArea); 1274 input_style = XIMPreeditArea | XIMStatusArea;
1381 else if (!strcmp (s[i], "Root")) 1275 else if (!strcmp (s[i], "Root"))
1382 input_style = (XIMPreeditNothing | XIMStatusNothing); 1276 input_style = XIMPreeditNothing | XIMStatusNothing;
1383 else if (!strcmp (s[i], "None")) 1277 else if (!strcmp (s[i], "None"))
1384 input_style = (XIMPreeditNone | XIMStatusNone); 1278 input_style = XIMPreeditNone | XIMStatusNone;
1279#ifdef ENABLE_XIM_ONTHESPOT
1280 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1281 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1282#endif
1283 else
1284 input_style = XIMPreeditNothing | XIMStatusNothing;
1385 1285
1386 for (j = 0; j < xim_styles->count_styles; j++) 1286 for (j = 0; j < xim_styles->count_styles; j++)
1387 if (input_style == xim_styles->supported_styles[j]) 1287 if (input_style == xim_styles->supported_styles[j])
1388 { 1288 {
1389 rxvt_freecommastring (s); 1289 rxvt_freecommastring (s);
… …
1427 "*", 1327 "*",
1428 fheight, 1328 fheight,
1429 fheight + 1, fheight - 1, 1329 fheight + 1, fheight - 1,
1430 fheight - 2, fheight + 2); 1330 fheight - 2, fheight + 2);
1431 1331
1432 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1332 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1433 &missing_charset_list, &missing_charset_count, &def_string); 1333 &missing_charset_list, &missing_charset_count, &def_string);
1434 1334
1435 if (missing_charset_list) 1335 if (missing_charset_list)
1436 XFreeStringList (missing_charset_list); 1336 XFreeStringList (missing_charset_list);
1437 1337
… …
1478 XNBackground, bg, 1378 XNBackground, bg,
1479 XNArea, &status_rect, 1379 XNArea, &status_rect,
1480 XNFontSet, fs, 1380 XNFontSet, fs,
1481 NULL); 1381 NULL);
1482 } 1382 }
1383#if ENABLE_XIM_ONTHESPOT
1384 else if (input_style & XIMPreeditCallbacks)
1385 {
1386 im_set_position (spot);
1387
1388 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1389 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1390 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1391# if 0
1392 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1393# endif
1394
1395 preedit_attr = XVaCreateNestedList (0,
1396 XNSpotLocation, &spot,
1397 XNPreeditStartCallback, &xcb[0],
1398 XNPreeditDoneCallback , &xcb[1],
1399 XNPreeditDrawCallback , &xcb[2],
1400# if 0
1401 XNPreeditCaretCallback, &xcb[3],
1402# endif
1403 NULL);
1404 }
1405#endif
1483 1406
1484 Input_Context = XCreateIC (xim, 1407 Input_Context = XCreateIC (xim,
1485 XNInputStyle, input_style, 1408 XNInputStyle, input_style,
1486 XNClientWindow, vt, 1409 XNClientWindow, vt,
1487 XNFocusWindow, parent[0], 1410 XNFocusWindow, parent[0],
… …
1489 preedit_attr, 1412 preedit_attr,
1490 status_attr ? XNStatusAttributes : NULL, 1413 status_attr ? XNStatusAttributes : NULL,
1491 status_attr, NULL); 1414 status_attr, NULL);
1492 1415
1493 if (preedit_attr) XFree (preedit_attr); 1416 if (preedit_attr) XFree (preedit_attr);
1494 if (status_attr) XFree (status_attr); 1417 if (status_attr) XFree (status_attr);
1495 if (fs) XFreeFontSet (display->display, fs); 1418 if (fs) XFreeFontSet (dpy, fs);
1496 1419
1497 if (Input_Context == NULL) 1420 if (Input_Context == NULL)
1498 { 1421 {
1499 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1422 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1500 im_destroy (); 1423 im_destroy ();
1501 return false; 1424 return false;
1502 } 1425 }
1503 1426
1504 if (input_style & XIMPreeditArea) 1427#if 0
1428 // unfortunately, only the focus window is used by XIM, hard to fix
1429 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1430 vt_select_input ();
1431#endif
1432
1505 IMSetStatusPosition (); 1433 IMSetPosition ();
1506 1434
1507 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1508 return true; 1435 return true;
1509} 1436}
1510 1437
1511void 1438void
1512rxvt_term::im_cb () 1439rxvt_term::im_cb ()
… …
1518 1445
1519 make_current (); 1446 make_current ();
1520 1447
1521 im_destroy (); 1448 im_destroy ();
1522 1449
1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1524 if (Input_Context) 1450 if (Input_Context)
1525 return; 1451 return;
1526 1452
1527#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1453#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1528 if (rs[Rs_imLocale]) 1454 if (rs[Rs_imLocale])
… …
1570 SET_LOCALE (locale); 1496 SET_LOCALE (locale);
1571#endif 1497#endif
1572} 1498}
1573 1499
1574void 1500void
1575rxvt_term::IMSetStatusPosition () 1501rxvt_term::IMSetPosition ()
1576{ 1502{
1577 XRectangle preedit_rect, status_rect, *needed_rect; 1503 XRectangle preedit_rect, status_rect, *needed_rect;
1578 XVaNestedList preedit_attr, status_attr; 1504 XVaNestedList preedit_attr, status_attr;
1579 1505
1580 if (!Input_Context 1506 if (!Input_Context
1581 || !focus 1507 || !focus
1582 || !(input_style & XIMPreeditArea) 1508 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1583 || !IMisRunning ()) 1509 || !IMisRunning ())
1584 return; 1510 return;
1585 1511
1512 if (input_style & XIMPreeditPosition)
1513 {
1514 im_set_size (preedit_rect);
1515 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1516
1517 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, NULL);
1519 }
1520 else
1521 {
1586 /* Getting the necessary width of preedit area */ 1522 /* Getting the necessary width of preedit area */
1587 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1523 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1588 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1524 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1589 XFree (status_attr); 1525 XFree (status_attr);
1590 1526
1591 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1527 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1592 XFree (needed_rect); 1528 XFree (needed_rect);
1593 1529
1594 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1530 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1595 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1531 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1596 1532
1597 XSetICValues (Input_Context, 1533 XSetICValues (Input_Context,
1598 XNPreeditAttributes, preedit_attr, 1534 XNPreeditAttributes, preedit_attr,
1599 XNStatusAttributes, status_attr, NULL); 1535 XNStatusAttributes, status_attr,
1536 NULL);
1600 1537
1538 XFree (status_attr);
1539 }
1540
1601 XFree (preedit_attr); 1541 XFree (preedit_attr);
1602 XFree (status_attr);
1603} 1542}
1604#endif /* USE_XIM */ 1543#endif /* USE_XIM */
1605 1544
1606/*----------------------------------------------------------------------*/ 1545void
1607rxvt_t rxvt_current_term; 1546rxvt_term::get_window_origin (int &x, int &y)
1547{
1548 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551}
1552
1553Pixmap
1554rxvt_term::get_pixmap_property (int prop_id)
1555{
1556 if (prop_id > 0 && prop_id < NUM_XA)
1557 if (xa[prop_id])
1558 {
1559 int aformat;
1560 unsigned long nitems, bytes_after;
1561 Atom atype;
1562 unsigned char *prop = NULL;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP)
1567 return *(Pixmap *)prop;
1568 }
1569
1570 return None;
1571}
1572
1573#ifdef HAVE_BG_PIXMAP
1574# if TRACE_PIXMAPS
1575# undef update_background
1576void
1577rxvt_term::trace_update_background (const char *file, int line)
1578{
1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580 update_background ();
1581}
1582# endif
1583
1584void
1585rxvt_term::update_background ()
1586{
1587 if (update_background_ev.is_active ())
1588 return;
1589
1590 bgPixmap.invalidate ();
1591
1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1593
1594 if (to_wait <= 0.)
1595 bgPixmap.render ();
1596 else
1597 update_background_ev.start (to_wait);
1598}
1599
1600void
1601rxvt_term::update_background_cb (ev::timer &w, int revents)
1602{
1603 make_current ();
1604
1605 update_background_ev.stop ();
1606 bgPixmap.render ();
1607 refresh_check ();
1608}
1609
1610#endif /* HAVE_BG_PIXMAP */
1608 1611
1609/*----------------------- end-of-file (C source) -----------------------*/ 1612/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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