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

Diff Legend

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