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.137 by root, Tue Feb 15 16:04:45 2005 UTC vs.
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
38#include <cstring> 41#include <cstring>
39 42
40#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
43 46
44#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
45# include <termios.h> 48# include <termios.h>
46#endif 49#endif
47 50
48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
51
52vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
53 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
54static char curlocale[128]; 56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
58{ 60{
59 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 62 return false;
61 63
62 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
64 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
65} 80}
66 81
67#if ENABLE_COMBINING 82#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
69 84
… …
134 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif 150#endif
136#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif 153#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif 156#endif
145#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 171#endif
160#ifdef USE_XIM 172#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
162#endif 174#endif
163 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
164 sw_int (this, &rxvt_term::sig_term), 176 bell_ev (this, &rxvt_term::bell_cb),
165 sw_chld (this, &rxvt_term::sig_chld), 177#endif
166 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
168 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
171 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
172 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
175 188
176 termlist.push_back (this); 189 termlist.push_back (this);
177 190
178#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
179 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif 193#endif
184} 194}
185 195
186// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit 197// for use before an emergency exit
188void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
189{ 199{
190 if (cmd_pid) 200 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
192 202
193#ifdef UTMP_SUPPORT 203 pty_ev.stop ();
194 privileged_utmp (RESTORE); 204 delete pty; pty = 0;
195#endif
196
197 pty.put ();
198} 205}
199 206
200rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
201{ 208{
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 209 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 210
204 emergency_cleanup (); 211 emergency_cleanup ();
205 212
206#if ENABLE_STYLES 213#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 214 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 215 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 216 delete fontset[i];
210#endif 217#endif
211 delete TermWin.fontset[0]; 218 delete fontset[0];
212 219
213 if (display) 220 if (display)
214 { 221 {
215 dDisp;
216
217 selection_clear (); 222 selection_clear ();
218 223
219#ifdef USE_XIM 224#ifdef USE_XIM
220 im_destroy (); 225 im_destroy ();
221#endif 226#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif
225#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
228#endif 230#endif
229#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231#endif 233#endif
232#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243#endif 245#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248#endif 250#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 251 if (gc) XFreeGC (dpy, gc);
250 252
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 253 delete drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows 254 // destroy all windows
258 if (TermWin.parent[0] 255 if (parent[0])
259#if ENABLE_FRILLS 256 XDestroyWindow (dpy, parent[0]);
260 && !rs[Rs_embed] 257
261#endif 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
262 ) 260 {
263 XDestroyWindow (disp, TermWin.parent[0]); 261 pix_colors_focused [i].free (this);
264 } 262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
265 266
266 // TODO: free pixcolours, colours should become part of rxvt_display 267 clear ();
268 }
267 269
268 delete pix_colors_focused; 270 delete pix_colors_focused;
269#ifdef OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
270 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
271#endif 273#endif
272 274
273 displays.put (display); 275 displays.put (display);
274 276
… …
278 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
279 free (allocated [i]); 281 free (allocated [i]);
280 282
281 free (selection.text); 283 free (selection.text);
282 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
283 free (env_windowid);
284 free (env_display); 285 free (env_display);
285 free (env_term); 286 free (env_term);
286 free (env_colorfgbg);
287 free (locale); 287 free (locale);
288 free (v_buffer); 288 free (v_buffer);
289 free (incr_buf); 289 free (incr_buf);
290 290
291 delete envv; 291 delete envv;
… …
294#ifdef KEYSYM_RESOURCE 294#ifdef KEYSYM_RESOURCE
295 delete keyboard; 295 delete keyboard;
296#endif 296#endif
297} 297}
298 298
299// child has exited, usually destroys
300void
301rxvt_term::child_cb (child_watcher &w, int status)
302{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304
305 cmd_pid = 0;
306
307 if (!OPTION (Opt_hold))
308 destroy ();
309}
310
299void 311void
300rxvt_term::destroy () 312rxvt_term::destroy ()
301{ 313{
302 if (destroy_ev.active) 314 if (destroy_ev.active)
303 return; 315 return;
304 316
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318
305#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
306 scr_overlay_off (); 320 scr_overlay_off ();
307#endif 321#endif
308 322
309 if (display) 323 if (display)
… …
311#if USE_XIM 325#if USE_XIM
312 im_ev.stop (display); 326 im_ev.stop (display);
313#endif 327#endif
314#if HAVE_SCROLLBARS 328#if HAVE_SCROLLBARS
315 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
316#endif
317#if MENUBAR
318 menubar_ev.stop (display);
319#endif 330#endif
320#if TRANSPARENT 331#if TRANSPARENT
321 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
322#endif 333#endif
323 incr_ev.stop (); 334 incr_ev.stop ();
… …
347} 358}
348 359
349void 360void
350rxvt_term::destroy_cb (time_watcher &w) 361rxvt_term::destroy_cb (time_watcher &w)
351{ 362{
352 SET_R (this); 363 make_current ();
353 364
354 delete this; 365 delete this;
355} 366}
356 367
357/*----------------------------------------------------------------------*/ 368/*----------------------------------------------------------------------*/
… …
366{ 377{
367 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
368 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
369} 380}
370 381
371#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
372static void 383static void
373print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
374{ 385{
375 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
376 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
422{ 433{
423 if (GET_R->allowedxerror == -1) 434 if (GET_R->allowedxerror == -1)
424 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
425 else 436 else
426 { 437 {
427 //TODO: GET_R is most likely not the terminal which caused the error 438 // GET_R is most likely not the terminal which caused the error,
428 //TODO: maybe just output the error and continue? 439 // so just output the error and continue
429#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
430 print_x_error (display, event); 443 print_x_error (display, event);
431#else
432 old_xerror_handler (display, event);
433#endif 444#endif
434 } 445 }
435 446
436 return 0; 447 return 0;
437} 448}
… …
443 DisplayString (display)); 454 DisplayString (display));
444 rxvt_emergency_cleanup (); 455 rxvt_emergency_cleanup ();
445 _exit (EXIT_FAILURE); 456 _exit (EXIT_FAILURE);
446} 457}
447 458
448/*
449 * Catch a fatal signal and tidy up before quitting
450 */
451void
452rxvt_term::sig_term (sig_watcher &w)
453{
454#ifdef DEBUG_CMD
455 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
456#endif
457 rxvt_emergency_cleanup ();
458 signal (w.signum, SIG_DFL);
459 kill (getpid (), w.signum);
460}
461
462/*----------------------------------------------------------------------*/ 459/*----------------------------------------------------------------------*/
463/* rxvt_init () */
464bool 460bool
465rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
466{ 462{
463 this->envv = envv;
464
467 SET_R (this); 465 SET_R (this);
468
469 set_locale (""); 466 set_locale ("");
467 set_environ (envv); // few things in X do not call setlocale :(
470 468
471 if (!init_vars ()) 469 if (!init_vars ())
472 return false; 470 return false;
473 471
474 init_secondary (); 472 init_secondary ();
… …
477 475
478#ifdef KEYSYM_RESOURCE 476#ifdef KEYSYM_RESOURCE
479 keyboard->register_done (); 477 keyboard->register_done ();
480#endif 478#endif
481 479
482#if MENUBAR_MAX
483 menubar_read (rs[Rs_menu]);
484#endif
485#ifdef HAVE_SCROLLBARS 480#ifdef HAVE_SCROLLBARS
486 if (options & Opt_scrollBar) 481 if (OPTION (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 483#endif
489 484
485 pty = ptytty::create ();
486
490 create_windows (argc, argv); 487 create_windows (argc, argv);
491 488
492 dDisp;
493
494 init_xlocale (); 489 init_xlocale ();
495 490
496 scr_reset (); /* initialize screen */ 491 scr_reset (); // initialize screen
497 492
498#if 0 493#if 0
499 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
500#endif 495#endif
501 496
502#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
503 if (options & Opt_scrollBar) 498 if (OPTION (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
505#endif 500#endif
506#if (MENUBAR_MAX)
507 if (menubar_visible ())
508 XMapWindow (disp, menuBar.win);
509#endif
510#ifdef TRANSPARENT 501#ifdef TRANSPARENT
511 if (options & Opt_transparent) 502 if (OPTION (Opt_transparent))
512 { 503 {
513 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
514 check_our_parents (); 505 check_our_parents ();
515 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
516 } 507 }
517#endif 508#endif
518 509
519 XMapWindow (disp, TermWin.vt);
520 XMapWindow (disp, TermWin.parent[0]);
521
522 set_colorfgbg (); 510 set_colorfgbg ();
523 511
524 init_command (cmd_argv); 512 init_command (cmd_argv);
525 513
526 free (cmd_argv); 514 free (cmd_argv);
527 515
516 if (pty->pty >= 0)
528 pty_ev.start (pty.pty, EVENT_READ); 517 pty_ev.start (pty->pty, EVENT_READ);
529 518
530 check_ev.start (); 519 check_ev.start ();
531 520
521 HOOK_INVOKE ((this, HOOK_START, DT_END));
522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
533 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]);
535
532 return true; 536 return true;
533} 537}
534 538
539static struct sig_handlers
540{
541 sig_watcher sw_term, sw_int;
542
543 /*
544 * Catch a fatal signal and tidy up before quitting
545 */
546 void
547 sig_term (sig_watcher &w)
548 {
549 rxvt_emergency_cleanup ();
550 signal (w.signum, SIG_DFL);
551 kill (getpid (), w.signum);
552 }
553
554 sig_handlers ()
555 : sw_term (this, &sig_handlers::sig_term),
556 sw_int (this, &sig_handlers::sig_term)
557 {
558 }
559} sig_handlers;
560
561char **rxvt_environ; // startup environment
562
535void 563void
536rxvt_init () 564rxvt_init ()
537{ 565{
538 /* 566 ptytty::init ();
539 * Save and then give up any super-user privileges 567
540 * If we need privileges in any area then we must specifically request it. 568 rxvt_environ = environ;
541 * We should only need to be root in these cases:
542 * 1. write utmp entries on some systems
543 * 2. chown tty on some systems
544 */
545 rxvt_privileges (SAVE);
546 rxvt_privileges (IGNORE);
547 569
548 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
549 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
572
573 sig_handlers.sw_term.start (SIGTERM);
574 sig_handlers.sw_int.start (SIGINT);
550 575
551 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
552 /* signal (SIGURG, SIG_DFL); */ 577 /* signal (SIGURG, SIG_DFL); */
553 578
554 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
555 // TODO: handle this with exceptions and tolerate the memory loss 580 // TODO: handle this with exceptions and tolerate the memory loss
556 XSetIOErrorHandler (rxvt_xioerror_handler); 581 XSetIOErrorHandler (rxvt_xioerror_handler);
557}
558 582
559/* ------------------------------------------------------------------------- * 583 XrmInitialize ();
560 * SIGNAL HANDLING & EXIT HANDLER *
561 * ------------------------------------------------------------------------- */
562/*
563 * Catch a SIGCHLD signal and exit if the direct child has died
564 */
565
566void
567rxvt_term::sig_chld (sig_watcher &w)
568{
569 // we are being called for every SIGCHLD, not just ours
570 int pid;
571
572 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
573 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
574 if (pid == (*t)->cmd_pid)
575 {
576 (*t)->destroy ();
577 break;
578 }
579} 584}
580 585
581/* ------------------------------------------------------------------------- * 586/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS * 587 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */ 588 * ------------------------------------------------------------------------- */
… …
590 rxvt_fatal ("memory allocation failure. aborting.\n"); 595 rxvt_fatal ("memory allocation failure. aborting.\n");
591 596
592 return p; 597 return p;
593} 598}
594 599
595/* INTPROTO */ 600void *
596void *
597rxvt_calloc (size_t number, size_t size) 601rxvt_calloc (size_t number, size_t size)
598{ 602{
599 void *p = calloc (number, size); 603 void *p = calloc (number, size);
600 604
601 if (!p) 605 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
603 607
604 return p; 608 return p;
605} 609}
606 610
607/* INTPROTO */ 611void *
608void *
609rxvt_realloc (void *ptr, size_t size) 612rxvt_realloc (void *ptr, size_t size)
610{ 613{
611 void *p = realloc (ptr, size); 614 void *p = realloc (ptr, size);
612 615
613 if (!p) 616 if (!p)
614 rxvt_fatal ("memory allocation failure. aborting.\n"); 617 rxvt_fatal ("memory allocation failure. aborting.\n");
615 618
616 return p; 619 return p;
617} 620}
618
619/* ------------------------------------------------------------------------- *
620 * PRIVILEGED OPERATIONS *
621 * ------------------------------------------------------------------------- */
622/* take care of suid/sgid super-user (root) privileges */
623void
624rxvt_privileges (rxvt_privaction action)
625{
626#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
627 static uid_t euid;
628 static gid_t egid;
629#endif
630
631#if ! defined(__CYGWIN32__)
632# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
633 /* setreuid () is the poor man's setuid (), seteuid () */
634# define seteuid(a) setreuid(-1, (a))
635# define setegid(a) setregid(-1, (a))
636# define HAVE_SETEUID
637# endif
638# ifdef HAVE_SETEUID
639 switch (action)
640 {
641 case IGNORE:
642 /*
643 * change effective uid/gid - not real uid/gid - so we can switch
644 * back to root later, as required
645 */
646 seteuid (getuid ());
647 setegid (getgid ());
648 break;
649 case SAVE:
650 euid = geteuid ();
651 egid = getegid ();
652 break;
653 case RESTORE:
654 seteuid (euid);
655 setegid (egid);
656 break;
657 }
658# else
659 switch (action)
660 {
661 case IGNORE:
662 setuid (getuid ());
663 setgid (getgid ());
664 /* FALLTHROUGH */
665 case SAVE:
666 /* FALLTHROUGH */
667 case RESTORE:
668 break;
669 }
670# endif
671#endif
672}
673
674#ifdef UTMP_SUPPORT
675void
676rxvt_term::privileged_utmp (rxvt_privaction action)
677{
678 if ((options & Opt_utmpInhibit)
679 || !pty.name || !*pty.name)
680 return;
681
682 rxvt_privileges (RESTORE);
683
684 if (action == SAVE)
685 makeutent (pty.name, rs[Rs_display_name]);
686 else
687 cleanutent ();
688
689 rxvt_privileges (IGNORE);
690}
691#endif
692 621
693/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
694/* 623/*
695 * window size/position calculcations for XSizeHint and other storage. 624 * window size/position calculcations for XSizeHint and other storage.
696 * if width/height are non-zero then override calculated width/height 625 * if width/height are non-zero then override calculated width/height
697 */ 626 */
698void 627void
699rxvt_term::window_calc (unsigned int width, unsigned int height) 628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
700{ 629{
701 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
702 int x, y, sb_w, mb_h, flags; 631 int x, y, sb_w, flags;
703 unsigned int w, h; 632 unsigned int w, h;
704 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
705 dDisp;
706 634
707 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
708 TermWin.ncol, TermWin.nrow, szHint.width,
709 szHint.height));
710 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
711 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
712 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
713 638
714 recalc_x = recalc_y = 0; 639 recalc_x = recalc_y = 0;
715 flags = 0; 640 flags = 0;
641
716 if (!parsed_geometry) 642 if (!parsed_geometry)
717 { 643 {
718 parsed_geometry = 1; 644 parsed_geometry = 1;
645
719 if (rs[Rs_geometry]) 646 if (rs[Rs_geometry])
720 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 647 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
721 648
722 if (flags & WidthValue) 649 if (flags & WidthValue)
723 { 650 {
724 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 651 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 652 szHint.flags |= USSize;
726 } 653 }
727 654
728 if (flags & HeightValue) 655 if (flags & HeightValue)
729 { 656 {
730 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 657 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
731 szHint.flags |= USSize; 658 szHint.flags |= USSize;
732 } 659 }
733 660
734 if (flags & XValue) 661 if (flags & XValue)
735 { 662 {
736 szHint.x = x; 663 szHint.x = x;
737 szHint.flags |= USPosition; 664 szHint.flags |= USPosition;
665
738 if (flags & XNegative) 666 if (flags & XNegative)
739 { 667 {
740 recalc_x = 1; 668 recalc_x = 1;
741 szHint.win_gravity = NorthEastGravity; 669 szHint.win_gravity = NorthEastGravity;
742 } 670 }
… …
744 672
745 if (flags & YValue) 673 if (flags & YValue)
746 { 674 {
747 szHint.y = y; 675 szHint.y = y;
748 szHint.flags |= USPosition; 676 szHint.flags |= USPosition;
677
749 if (flags & YNegative) 678 if (flags & YNegative)
750 { 679 {
751 recalc_y = 1; 680 recalc_y = 1;
681
752 if (szHint.win_gravity == NorthEastGravity) 682 if (szHint.win_gravity == NorthEastGravity)
753 szHint.win_gravity = SouthEastGravity; 683 szHint.win_gravity = SouthEastGravity;
754 else 684 else
755 szHint.win_gravity = SouthWestGravity; 685 szHint.win_gravity = SouthWestGravity;
756 } 686 }
757 } 687 }
758 } 688 }
759 689
760 /* TODO: BOUNDS */ 690 /* TODO: BOUNDS */
761 TermWin.width = TermWin.ncol * TermWin.fwidth; 691 width = ncol * fwidth;
762 TermWin.height = TermWin.nrow * TermWin.fheight; 692 height = nrow * fheight;
763 max_width = MAX_COLS * TermWin.fwidth; 693 max_width = MAX_COLS * fwidth;
764 max_height = MAX_ROWS * TermWin.fheight; 694 max_height = MAX_ROWS * fheight;
765 695
766 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 696 szHint.base_width = szHint.base_height = 2 * int_bwidth;
767 697
768 sb_w = mb_h = 0; 698 sb_w = 0;
769 window_vt_x = window_vt_y = TermWin.int_bwidth; 699 window_vt_x = window_vt_y = int_bwidth;
770 700
771 if (scrollbar_visible ()) 701 if (scrollBar.state)
772 { 702 {
773 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
774 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
775 if (!(options & Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
776 window_vt_x += sb_w; 707 window_vt_x += sb_w;
777 } 708 }
778 709
779 if (menubar_visible ())
780 {
781 mb_h = menuBar_TotalHeight ();
782 szHint.base_height += mb_h;
783 window_vt_y += mb_h;
784 }
785
786 szHint.width_inc = TermWin.fwidth; 710 szHint.width_inc = fwidth;
787 szHint.height_inc = TermWin.fheight; 711 szHint.height_inc = fheight;
788 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
789 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
790 714
791 if (width && width - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
792 { 716 {
793 szHint.width = width; 717 szHint.width = newwidth;
794 TermWin.width = width - szHint.base_width; 718 width = newwidth - szHint.base_width;
795 } 719 }
796 else 720 else
797 { 721 {
798 MIN_IT (TermWin.width, max_width); 722 min_it (width, max_width);
799 szHint.width = szHint.base_width + TermWin.width; 723 szHint.width = szHint.base_width + width;
800 } 724 }
801 725
802 if (height && height - szHint.base_height < max_height) 726 if (newheight && newheight - szHint.base_height < max_height)
803 { 727 {
804 szHint.height = height; 728 szHint.height = newheight;
805 TermWin.height = height - szHint.base_height; 729 height = newheight - szHint.base_height;
806 } 730 }
807 else 731 else
808 { 732 {
809 MIN_IT (TermWin.height, max_height); 733 min_it (height, max_height);
810 szHint.height = szHint.base_height + TermWin.height; 734 szHint.height = szHint.base_height + height;
811 } 735 }
812 736
813 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
814 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
815 739
816 if (recalc_x) 740 if (recalc_x)
817 szHint.x += (DisplayWidth (disp, display->screen) 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
818 - szHint.width - 2 * TermWin.ext_bwidth); 742
819 if (recalc_y) 743 if (recalc_y)
820 szHint.y += (DisplayHeight (disp, display->screen) 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
821 - szHint.height - 2 * TermWin.ext_bwidth);
822 745
823 TermWin.ncol = TermWin.width / TermWin.fwidth; 746 ncol = width / fwidth;
824 TermWin.nrow = TermWin.height / TermWin.fheight; 747 nrow = height / fheight;
825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
826 TermWin.ncol, TermWin.nrow, szHint.width,
827 szHint.height));
828 return;
829} 748}
830 749
831/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
832/* 751/*
833 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
834 * Called after a window size change. 753 * Called after a window size change.
835 */ 754 */
836void 755void
837rxvt_term::tt_winch () 756rxvt_term::tt_winch ()
838{ 757{
839 if (pty.pty < 0) 758 if (pty->pty < 0)
840 return; 759 return;
841 760
842 struct winsize ws; 761 struct winsize ws;
843 762
844 ws.ws_col = TermWin.ncol; 763 ws.ws_col = ncol;
845 ws.ws_row = TermWin.nrow; 764 ws.ws_row = nrow;
846 ws.ws_xpixel = TermWin.width; 765 ws.ws_xpixel = width;
847 ws.ws_ypixel = TermWin.height; 766 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 768
850#if 0 769#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 771 if (cmd_pid) /* force through to the command */
853 kill (cmd_pid, SIGWINCH); 772 kill (-cmd_pid, SIGWINCH);
854#endif 773#endif
855} 774}
856 775
857/*----------------------------------------------------------------------*/ 776/*----------------------------------------------------------------------*/
858/* set_fonts () - load and set the various fonts 777/* set_fonts () - load and set the various fonts
859/* 778 *
860 * init = 1 - initialize 779 * init = 1 - initialize
861 * 780 *
862 * fontname == FONT_UP - switch to bigger font 781 * fontname == FONT_UP - switch to bigger font
863 * fontname == FONT_DN - switch to smaller font 782 * fontname == FONT_DN - switch to smaller font
864 */ 783 */
… …
876 return false; 795 return false;
877 } 796 }
878 797
879#if ENABLE_STYLES 798#if ENABLE_STYLES
880 for (int i = RS_styleCount; --i; ) 799 for (int i = RS_styleCount; --i; )
881 if (TermWin.fontset[i] != TermWin.fontset[0]) 800 if (fontset[i] != fontset[0])
882 delete TermWin.fontset[i]; 801 delete fontset[i];
883#endif 802#endif
884 803
885 delete TermWin.fontset[0]; 804 delete fontset[0];
886 TermWin.fontset[0] = fs; 805 fontset[0] = fs;
887 806
888 prop = (*fs)[1]->properties (); 807 prop = (*fs)[1]->properties ();
889 prop.height += TermWin.lineSpace; 808 prop.height += lineSpace;
890 fs->set_prop (prop); 809 fs->set_prop (prop);
891 810
892 TermWin.fwidth = prop.width; 811 fwidth = prop.width;
893 TermWin.fheight = prop.height; 812 fheight = prop.height;
894 TermWin.fweight = prop.weight; 813 fbase = prop.ascent;
895 TermWin.fslant = prop.slant;
896 TermWin.fbase = (*fs)[1]->ascent;
897 814
898 for (int style = 1; style < 4; style++) 815 for (int style = 1; style < 4; style++)
899 { 816 {
900#if ENABLE_STYLES 817#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 818 const char *res = rs[Rs_font + style];
902 819
903 if (res && !*res) 820 if (res && !*res)
904 TermWin.fontset[style] = TermWin.fontset[0]; 821 fontset[style] = fontset[0];
905 else 822 else
906 { 823 {
907 TermWin.fontset[style] = fs = new rxvt_fontset (this); 824 fontset[style] = fs = new rxvt_fontset (this);
908 rxvt_fontprop prop2 = prop; 825 rxvt_fontprop prop2 = prop;
909 826
910 if (res) 827 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset; 828 prop2.weight = prop2.slant = rxvt_fontprop::unset;
912 else 829 else
913 { 830 {
914 res = TermWin.fontset[0]->fontdesc; 831 res = fontset[0]->fontdesc;
915 832
916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
917 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 834 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
918 } 835 }
919 836
920 fs->populate (res); 837 fs->populate (res);
921 fs->set_prop (prop2); 838 fs->set_prop (prop2);
922 } 839 }
923#else 840#else
924 TermWin.fontset[style] = TermWin.fontset[0]; 841 fontset[style] = fontset[0];
925#endif 842#endif
926 } 843 }
927 844
928 if (TermWin.parent[0]) 845 if (parent[0])
929 { 846 {
930 resize_all_windows (0, 0, 0); 847 resize_all_windows (0, 0, 0);
931 scr_remap_chars (); 848 scr_remap_chars ();
932 scr_touch (true); 849 scr_touch (true);
933 } 850 }
… …
935 return true; 852 return true;
936} 853}
937 854
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 856{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, TermWin.parent[0], 857 XChangeProperty (dpy, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 860}
945 861
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 863{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
951 866
952 XChangeProperty (display->display, TermWin.parent[0], 867 XChangeProperty (dpy, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
955 870
956 free (s); 871 free (s);
957 free (ws); 872 free (ws);
… …
962/* xterm sequences - title, iconName, color (exptl) */ 877/* xterm sequences - title, iconName, color (exptl) */
963void 878void
964rxvt_term::set_title (const char *str) 879rxvt_term::set_title (const char *str)
965{ 880{
966 set_string_property (XA_WM_NAME, str); 881 set_string_property (XA_WM_NAME, str);
967#if ENABLE_FRILLS 882#if ENABLE_EWMH
968 set_utf8_property (xa[XA_NET_WM_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_NAME], str);
969#endif 884#endif
970} 885}
971 886
972void 887void
973rxvt_term::set_icon_name (const char *str) 888rxvt_term::set_icon_name (const char *str)
974{ 889{
975 set_string_property (XA_WM_ICON_NAME, str); 890 set_string_property (XA_WM_ICON_NAME, str);
976#if ENABLE_FRILLS 891#if ENABLE_EWMH
977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
978#endif 893#endif
979} 894}
980 895
981#ifdef XTERM_COLOR_CHANGE 896#ifdef XTERM_COLOR_CHANGE
982void 897void
983rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
984{ 899{
985 rxvt_color xcol; 900 rxvt_color xcol;
986 int i; 901 int i;
987 902
988 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
989 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
990 909
991 /* handle color aliases */ 910 /* handle color aliases */
992 if (isdigit (*color)) 911 if (isdigit (*color))
993 { 912 {
994 i = atoi (color); 913 i = atoi (color);
995 914
996 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
997 { /* bright colors */ 916 { /* bright colors */
998 i -= 8; 917 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx);
1002 goto Done; 919 goto done;
1003# endif
1004 } 920 }
1005 921
1006 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 923 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1009 SET_PIXCOLOR (idx);
1010 goto Done; 925 goto done;
1011 } 926 }
1012 } 927 }
1013 928
1014 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
1015 return;
1016
1017 /* XStoreColor (display->display, display->cmap, XColor*); */
1018 930
1019 /* 931 /*
1020 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
1021 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
1022 */ 934 */
1023# if 0
1024 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[idx] == pix_colors[i])
1026 break;
1027 if (i > Color_White)
1028 {
1029 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1030 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1031 DisplayPlanes (display->display, display->screen));
1032 }
1033# endif
1034 935
1035 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx);
1037 937
1038 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
1039 /* Cursor cursor; */ 939 /* Cursor cursor; */
1040Done: 940done:
941
1041#ifdef OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
1042 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
1043 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
1044#endif 949#endif
1045 950
1046 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
1047 952
1048 recolour_cursor (); 953 recolour_cursor ();
… …
1054#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1055 960
1056void 961void
1057rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1058{ 963{
1059 XColor xcol[2]; 964 XColor fg, bg;
1060 965
1061 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1062 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1063 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1064 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1065 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1066 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1067 973
1068 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1069 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1070} 975}
1071 976
1072/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1073/* 978/*
1074 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1078{ 983{
1079 unsigned int i; 984 unsigned int i;
1080 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1081 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1082 987
1083 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1084 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1085 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1086 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1087 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1088 { 992 {
… …
1103 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1104} 1008}
1105 1009
1106/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1107 1011
1108int 1012bool
1109rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1110{ 1014{
1111 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1112 {
1113 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1114 return false;
1115 }
1116
1117 return true; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1118} 1026}
1119 1027
1120/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1121 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1122 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1123void 1031void
1124rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1125{ 1033{
1126 int fix_screen; 1034 int fix_screen;
1127#ifdef SMART_RESIZE 1035 int old_width = szHint.width;
1128 int old_width = szHint.width, old_height = szHint.height; 1036 int old_height = szHint.height;
1129#endif
1130 dDisp;
1131 1037
1132 window_calc (width, height); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1133 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1134 1042
1135 if (!ignoreparent) 1043 if (!ignoreparent)
1136 { 1044 {
1137#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1138 /* 1046 /*
… …
1142 int x, y, x1, y1; 1050 int x, y, x1, y1;
1143 int dx, dy; 1051 int dx, dy;
1144 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1145 Window unused_cr; 1053 Window unused_cr;
1146 1054
1147 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1148 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1149 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1150 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1151 /* 1059 /*
1152 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1153 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1154 */ 1062 */
… …
1156 { 1064 {
1157 x -= x1; 1065 x -= x1;
1158 y -= y1; 1066 y -= y1;
1159 } 1067 }
1160 1068
1161 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1162 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1163 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1164 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1165 1073
1166 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1167 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1168 dx = 0; 1076 dx = 0;
… …
1171 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1172 dy = 0; 1080 dy = 0;
1173 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1174 dy /= 2; 1082 dy /= 2;
1175 1083
1176 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1177 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1178#else 1086#else
1179 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1180#endif 1088#endif
1181 } 1089 }
1182 1090
1183 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1184 1092
1185 if (fix_screen || width != old_width || height != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1186 { 1094 {
1187 if (scrollbar_visible ()) 1095 if (scrollBar.state)
1188 { 1096 {
1189 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1190 window_sb_x, 0, 1098 window_sb_x, 0,
1191 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1192 resize_scrollbar (); 1100 resize_scrollbar ();
1193 } 1101 }
1194 1102
1195 if (menubar_visible ())
1196 XMoveResizeWindow (disp, menuBar.win,
1197 window_vt_x, 0,
1198 TermWin_TotalWidth (), menuBar_TotalHeight ());
1199
1200 XMoveResizeWindow (disp, TermWin.vt, 1103 XMoveResizeWindow (dpy, vt,
1201 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1202 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1105 width, height);
1203 1106
1204 scr_clear (); 1107 scr_clear ();
1205#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1206 resize_pixmap (); 1109 resize_pixmap ();
1207#endif 1110#endif
1208 } 1111 }
1209 1112
1210 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1211 {
1212 int curr_screen = -1;
1213 int old_ncol = prev_ncol;
1214
1215 /* scr_reset only works on the primary screen */
1216 if (old_height) /* this is not the first time through */
1217 {
1218 unsigned int ncol = TermWin.ncol;
1219 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1220 curr_screen = scr_change_screen (PRIMARY);
1221 TermWin.ncol = ncol;
1222 }
1223
1224 scr_reset (); 1114 scr_reset ();
1225 1115
1226 if (curr_screen >= 0) /* this is not the first time through */ 1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1227 { 1117 //scr_touch (false);
1228 scr_change_screen (curr_screen);
1229 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1230 }
1231 }
1232
1233 old_width = szHint.width;
1234 old_height = szHint.height;
1235 1118
1236#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1237 if (TermWin.pixmap) 1120 if (pixmap)
1238 scr_touch (false); 1121 scr_touch (false);
1239#endif 1122#endif
1240 1123
1241#ifdef USE_XIM 1124#ifdef USE_XIM
1242 IMSetStatusPosition (); 1125 IMSetPosition ();
1243#endif 1126#endif
1244} 1127}
1245 1128
1246/* 1129/*
1247 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
1248 * good for toggling 80/132 columns 1131 * good for toggling 80/132 columns
1249 */ 1132 */
1250void 1133void
1251rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1134rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1252{ 1135{
1253 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1254 1137
1255 if (width == 0 || height == 0) 1138 if (newwidth == 0 || newheight == 0)
1256 { 1139 {
1257 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1141
1258 if (width == 0) 1142 if (newwidth == 0)
1259 width = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1260 if (height == 0) 1144 if (newheight == 0)
1261 height = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
1262 }
1263
1264 if (width != TermWin.width || height != TermWin.height)
1265 { 1146 }
1147
1148 if (newwidth != width || newheight != height)
1149 {
1266 width += szHint.base_width; 1150 newwidth += szHint.base_width;
1267 height += szHint.base_height; 1151 newheight += szHint.base_height;
1268 resize_all_windows (width, height, 0); 1152 resize_all_windows (newwidth, newheight, 0);
1269 } 1153 }
1270} 1154}
1271 1155
1272/* -------------------------------------------------------------------- * 1156/* -------------------------------------------------------------------- *
1273 * - X INPUT METHOD ROUTINES - * 1157 * - X INPUT METHOD ROUTINES - *
… …
1275#ifdef USE_XIM 1159#ifdef USE_XIM
1276 1160
1277void 1161void
1278rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1279{ 1163{
1280 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1281 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1282} 1166}
1283 1167
1284void 1168void
1285rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1286{ 1170{
1287 // the int_bwidth terms make no sense to me 1171 // the int_bwidth terms make no sense to me
1288 size.x = TermWin.int_bwidth; 1172 size.x = int_bwidth;
1289 size.y = TermWin.int_bwidth; 1173 size.y = int_bwidth;
1290 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1174 size.width = Width2Pixel (ncol) + int_bwidth;
1291 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1175 size.height = Height2Pixel (nrow) + int_bwidth;
1292} 1176}
1293 1177
1294void 1178void
1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1179rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1296 XRectangle &status_rect, 1180 XRectangle &status_rect,
1297 const XRectangle &needed_rect) 1181 const XRectangle &needed_rect)
1298{ 1182{
1299 preedit_rect.x = needed_rect.width; 1183 preedit_rect.x = needed_rect.width;
1300 preedit_rect.y = 0; 1184 preedit_rect.y = 0;
1301 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1185 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1302 preedit_rect.height = TermWin.fheight; 1186 preedit_rect.height = fheight;
1303 1187
1304 status_rect.x = 0; 1188 status_rect.x = 0;
1305 status_rect.y = 0; 1189 status_rect.y = 0;
1306 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1190 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1307 status_rect.height = TermWin.fheight; 1191 status_rect.height = fheight;
1308} 1192}
1309 1193
1310/* Checking whether input method is running. */ 1194/* Checking whether input method is running. */
1311bool 1195bool
1312rxvt_term::IMisRunning () 1196rxvt_term::IMisRunning ()
… …
1323 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1324 1208
1325 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1326 *p = '\0'; 1210 *p = '\0';
1327 1211
1328 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1329 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1330 1214
1331 if (win != None) 1215 if (win != None)
1332 return True; 1216 return True;
1333 } 1217 }
1334 1218
… …
1340{ 1224{
1341 XPoint nspot; 1225 XPoint nspot;
1342 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1343 1227
1344 if (!Input_Context 1228 if (!Input_Context
1345 || !TermWin.focus 1229 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1347 return; 1231 return;
1348 1232
1349 im_set_position (nspot); 1233 im_set_position (nspot);
1350 1234
1351 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1370 input_method = 0; 1254 input_method = 0;
1371 } 1255 }
1372 1256
1373 Input_Context = 0; 1257 Input_Context = 0;
1374} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1375 1333
1376/* 1334/*
1377 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1378 * open a suitable preedit type 1336 * open a suitable preedit type
1379 */ 1337 */
… …
1386 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1345 unsigned long fg, bg;
1388 const char *p; 1346 const char *p;
1389 char **s; 1347 char **s;
1390 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1352
1353 set_environ (envv);
1391 1354
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1356 return false;
1394 1357
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1396 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1397 if (input_method == NULL) 1359 if (input_method == NULL)
1398 return false; 1360 return false;
1399 1361
1400 xim = input_method->xim; 1362 xim = input_method->xim;
… …
1420 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1421 1383
1422 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1423 { 1385 {
1424 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1425 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1426 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1427 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1428 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1429 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1430 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1431 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1432 1400
1433 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1434 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1435 { 1403 {
1436 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1438 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1439 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1440 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1441 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1474 "*", 1442 "*",
1475 TermWin.fheight, 1443 fheight,
1476 TermWin.fheight + 1, TermWin.fheight - 1, 1444 fheight + 1, fheight - 1,
1477 TermWin.fheight - 2, TermWin.fheight + 2); 1445 fheight - 2, fheight + 2);
1478 1446
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1481 1449
1482 if (missing_charset_list) 1450 if (missing_charset_list)
1483 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1484 1452
… …
1525 XNBackground, bg, 1493 XNBackground, bg,
1526 XNArea, &status_rect, 1494 XNArea, &status_rect,
1527 XNFontSet, fs, 1495 XNFontSet, fs,
1528 NULL); 1496 NULL);
1529 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1530 1521
1531 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1533 XNClientWindow, TermWin.vt, 1524 XNClientWindow, vt,
1534 XNFocusWindow, TermWin.parent[0], 1525 XNFocusWindow, parent[0],
1535 preedit_attr ? XNPreeditAttributes : NULL, 1526 preedit_attr ? XNPreeditAttributes : NULL,
1536 preedit_attr, 1527 preedit_attr,
1537 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1529 status_attr, NULL);
1539 1530
1540 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1541 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1542 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1543 1534
1544 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1545 { 1536 {
1546 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1547 im_destroy (); 1538 im_destroy ();
1548 return false; 1539 return false;
1549 } 1540 }
1550 1541
1551 if (input_style & XIMPreeditArea) 1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1545 vt_select_input ();
1546#endif
1547
1552 IMSetStatusPosition (); 1548 IMSetPosition ();
1553 1549
1554 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1555 return true; 1550 return true;
1556} 1551}
1557 1552
1558void 1553void
1559rxvt_term::im_cb () 1554rxvt_term::im_cb ()
1560{ 1555{
1561 int i, found, had_im; 1556 int i;
1562 const char *p; 1557 const char *p;
1563 char **s; 1558 char **s;
1564 char buf[IMBUFSIZ]; 1559 char buf[IMBUFSIZ];
1565 1560
1566 SET_R (this); 1561 make_current ();
1567 1562
1568 im_destroy (); 1563 im_destroy ();
1569 1564
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1565 if (Input_Context)
1572 return; 1566 return;
1573 1567
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1617 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1618#endif 1612#endif
1619} 1613}
1620 1614
1621void 1615void
1622rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1623{ 1617{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1626 1620
1627 if (!Input_Context 1621 if (!Input_Context
1628 || !TermWin.focus 1622 || !focus
1629 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1630 || !IMisRunning ()) 1624 || !IMisRunning ())
1631 return; 1625 return;
1632 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1633 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1634 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1635 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1636 XFree (status_attr); 1640 XFree (status_attr);
1637 1641
1638 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1639 XFree (needed_rect); 1643 XFree (needed_rect);
1640 1644
1641 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1642 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1643 1647
1644 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1645 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1646 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1647 1652
1653 XFree (status_attr);
1654 }
1655
1648 XFree (preedit_attr); 1656 XFree (preedit_attr);
1649 XFree (status_attr);
1650} 1657}
1651#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1652 1659
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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