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

Diff Legend

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