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

Diff Legend

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