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

Diff Legend

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