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.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.195 by root, Sun Jan 22 00:48:13 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"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
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#include <cstring>
48
49vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
50 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
51static char curlocale[128]; 56static char curlocale[128], savelocale[128];
52 57
53bool 58bool
54rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
55{ 60{
56 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 62 return false;
58 63
59 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
61 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);
62} 80}
63 81
64#if ENABLE_COMBINING 82#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
66 84
123 return len; 141 return len;
124 142
125} 143}
126#endif 144#endif
127 145
128void *
129rxvt_term::operator new (size_t s)
130{
131 void *p = malloc (s);
132
133 memset (p, 0, s);
134 return p;
135}
136
137void
138rxvt_term::operator delete (void *p, size_t s)
139{
140 free (p);
141}
142
143rxvt_term::rxvt_term () 146rxvt_term::rxvt_term ()
144 : 147 :
145#if TRANSPARENT 148#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 150#endif
148#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 153#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 156#endif
157#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
182{ 186{
183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184 188
185 termlist.push_back (this); 189 termlist.push_back (this);
186}
187 190
188rxvt_term::~rxvt_term () 191#ifdef KEYSYM_RESOURCE
189{ 192 keyboard = new keyboard_manager;
190 termlist.erase (find (termlist.begin (), termlist.end(), this)); 193#endif
194}
191 195
196// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit
198void rxvt_term::emergency_cleanup ()
199{
192 if (cmd_pid) 200 if (cmd_pid)
193 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
194 202
195 pty.put (); 203 delete pty; pty = 0;
204}
196 205
197#ifdef UTMP_SUPPORT 206rxvt_term::~rxvt_term ()
198 privileged_utmp (RESTORE); 207{
199#endif 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
200 209
210 emergency_cleanup ();
211
212#if ENABLE_STYLES
213 for (int i = RS_styleCount; --i; )
214 if (fontset[i] != fontset[0])
215 delete fontset[i];
216#endif
201 delete TermWin.fontset; 217 delete fontset[0];
202 218
203 if (display) 219 if (display)
204 { 220 {
221 dDisp;
222
205 selection_clear (); 223 selection_clear ();
206 224
207#ifdef USE_XIM 225#ifdef USE_XIM
208 im_destroy (); 226 im_destroy ();
209#endif 227#endif
210#ifdef MENUBAR
211 if (menubarGC) XFreeGC (display->display, menubarGC);
212#endif
213#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
214 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
215 if (ShadowGC) XFreeGC (display->display, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
216#endif 231#endif
217#ifdef PLAIN_SCROLLBAR 232#ifdef PLAIN_SCROLLBAR
218 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
219#endif 234#endif
220#ifdef NEXT_SCROLLBAR 235#ifdef NEXT_SCROLLBAR
221 if (blackGC) XFreeGC (display->display, blackGC); 236 if (blackGC) XFreeGC (disp, blackGC);
222 if (whiteGC) XFreeGC (display->display, whiteGC); 237 if (whiteGC) XFreeGC (disp, whiteGC);
223 if (grayGC) XFreeGC (display->display, grayGC); 238 if (grayGC) XFreeGC (disp, grayGC);
224 if (darkGC) XFreeGC (display->display, darkGC); 239 if (darkGC) XFreeGC (disp, darkGC);
225 if (stippleGC) XFreeGC (display->display, stippleGC); 240 if (stippleGC) XFreeGC (disp, stippleGC);
226 if (dimple) XFreePixmap (display->display, dimple); 241 if (dimple) XFreePixmap (disp, dimple);
227 if (upArrow) XFreePixmap (display->display, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
228 if (downArrow) XFreePixmap (display->display, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
229 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
230 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
231#endif 246#endif
232#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
233 if (topShadowGC) XFreeGC (display->display, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
234 if (botShadowGC) XFreeGC (display->display, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
235 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
236#endif 251#endif
237 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
238 253
239#if defined(MENUBAR) && (MENUBAR_MAX > 1)
240 delete menuBar.drawable; 254 delete drawable;
241 //if (menuBar.win)
242 // XDestroyWindow (display->display, menuBar.win);
243#endif
244 delete TermWin.drawable;
245 // destroy all windows 255 // destroy all windows
246 if (TermWin.parent[0]) 256 if (parent[0])
247 XDestroyWindow (display->display, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
248 } 258 }
249 259
250 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
251
252 delete pix_colors_focused; 261 delete pix_colors_focused;
253#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
254 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
255#endif 264#endif
256 265
257 displays.put (display); 266 displays.put (display);
258 267
259 scr_release (); 268 scr_release ();
260 269
261 /* clear all resources */ 270 /* clear all resources */
262 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
263 free (allocated[i]); 272 free (allocated [i]);
264 273
265 free (selection.text); 274 free (selection.text);
266 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
267 free (env_windowid); 276 free (env_windowid);
268 free (env_display); 277 free (env_display);
269 free (env_term); 278 free (env_term);
270 free (env_colorfgbg); 279 free (env_colorfgbg);
271 free (locale); 280 free (locale);
272#if 0 281 free (v_buffer);
273 free (codeset); 282 free (incr_buf);
274#endif
275 283
276 delete envv; 284 delete envv;
277 delete argv; 285 delete argv;
286
287#ifdef KEYSYM_RESOURCE
288 delete keyboard;
289#endif
290}
291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
278} 302}
279 303
280void 304void
281rxvt_term::destroy () 305rxvt_term::destroy ()
282{ 306{
283 if (destroy_ev.active) 307 if (destroy_ev.active)
284 return; 308 return;
285 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
286#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
287 scr_overlay_off (); 314 scr_overlay_off ();
288#endif 315#endif
289 316
290 if (display) 317 if (display)
292#if USE_XIM 319#if USE_XIM
293 im_ev.stop (display); 320 im_ev.stop (display);
294#endif 321#endif
295#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
296 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
297#endif
298#if MENUBAR
299 menubar_ev.stop (display);
300#endif 324#endif
301#if TRANSPARENT 325#if TRANSPARENT
302 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
303#endif 327#endif
304 incr_ev.stop (); 328 incr_ev.stop ();
328} 352}
329 353
330void 354void
331rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
332{ 356{
333 SET_R (this); 357 make_current ();
334 358
335 delete this; 359 delete this;
336}
337
338/*----------------------------------------------------------------------*/
339/* rxvt_init () */
340bool
341rxvt_term::init (int argc, const char *const *argv)
342{
343 SET_R (this);
344
345 if (!init_vars ())
346 return false;
347
348 init_secondary ();
349
350 const char **cmd_argv = init_resources (argc, argv);
351
352 set_locale ("");
353
354#if MENUBAR_MAX
355 menubar_read (rs[Rs_menu]);
356#endif
357#ifdef HAVE_SCROLLBARS
358 if (options & Opt_scrollBar)
359 scrollBar.setIdle (); /* set existence for size calculations */
360#endif
361
362 create_windows (argc, argv);
363
364 init_xlocale ();
365
366 scr_reset (); /* initialize screen */
367
368#if 0
369 XSynchronize (display->display, True);
370#endif
371
372#ifdef HAVE_SCROLLBARS
373 if (options & Opt_scrollBar)
374 resize_scrollbar (); /* create and map scrollbar */
375#endif
376#if (MENUBAR_MAX)
377 if (menubar_visible ())
378 XMapWindow (display->display, menuBar.win);
379#endif
380#ifdef TRANSPARENT
381 if (options & Opt_transparent)
382 {
383 XSelectInput (display->display, display->root, PropertyChangeMask);
384 check_our_parents ();
385 rootwin_ev.start (display, display->root);
386 }
387#endif
388
389 XMapWindow (display->display, TermWin.vt);
390 XMapWindow (display->display, TermWin.parent[0]);
391
392 init_command (cmd_argv);
393
394 pty_ev.start (pty.pty, EVENT_READ);
395
396 check_ev.start ();
397
398 return true;
399}
400
401static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
402
403void
404rxvt_init ()
405{
406 /* install exit handler for cleanup */
407#if 0
408#ifdef HAVE_ATEXIT
409 atexit (rxvt_clean_exit);
410#else
411#endif
412#endif
413 /*
414 * Save and then give up any super-user privileges
415 * If we need privileges in any area then we must specifically request it.
416 * We should only need to be root in these cases:
417 * 1. write utmp entries on some systems
418 * 2. chown tty on some systems
419 */
420 rxvt_privileges (SAVE);
421 rxvt_privileges (IGNORE);
422
423 struct sigaction sa;
424
425 sigfillset (&sa.sa_mask);
426 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
427 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
428 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
429 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
430 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
431 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
432 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
433
434 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
435 /* signal (SIGURG, SIG_DFL); */
436
437 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
439}
440
441/* ------------------------------------------------------------------------- *
442 * SIGNAL HANDLING & EXIT HANDLER *
443 * ------------------------------------------------------------------------- */
444/*
445 * Catch a SIGCHLD signal and exit if the direct child has died
446 */
447
448void rxvt_term::child_exited (int pid)
449{
450 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
451 if (pid == (*t)->cmd_pid)
452 {
453 (*t)->destroy ();
454 break;
455 }
456}
457
458/* ARGSUSED */
459/* INTPROTO */
460RETSIGTYPE
461rxvt_Child_signal (int sig __attribute__ ((unused)))
462{
463 int pid, save_errno = errno;
464
465 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
466 rxvt_term::child_exited (pid);
467
468 errno = save_errno;
469}
470
471/*
472 * Catch a fatal signal and tidy up before quitting
473 */
474/* INTPROTO */
475RETSIGTYPE
476rxvt_Exit_signal (int sig)
477{
478 signal (sig, SIG_DFL);
479#ifdef DEBUG_CMD
480 rxvt_warn ("caught signal %d, exiting.\n", sig);
481#endif
482 rxvt_clean_exit ();
483 kill (getpid (), sig);
484}
485
486/* INTPROTO */
487int
488rxvt_xerror_handler (Display *display, XErrorEvent *event)
489{
490 if (GET_R->allowedxerror == -1)
491 GET_R->allowedxerror = event->error_code;
492 else
493 {
494 old_xerror_handler (display, event);
495 GET_R->destroy ();
496 }
497
498 return 0;
499} 360}
500 361
501/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
502/* 363/*
503 * Exit gracefully, clearing the utmp entry and restoring tty attributes 364 * Exit gracefully, clearing the utmp entry and restoring tty attributes
504 * TODO: if debugging, this should free up any known resources if we can 365 * TODO: if debugging, this should free up any known resources if we can
505 */ 366 */
506/* INTPROTO */ 367static XErrorHandler old_xerror_handler;
368
369static void
370rxvt_emergency_cleanup ()
371{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup ();
374}
375
376#if ENABLE_FRILLS
377static void
378print_x_error (Display *dpy, XErrorEvent *event)
379{
380 char buffer[BUFSIZ];
381 char mesg[BUFSIZ];
382 char number[32];
383 char *mtype = "XlibMessage";
384 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
385 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
386 rxvt_warn ("An X Error occured, trying to continue after report.\n");
387 rxvt_warn ("%s: %s\n", mesg, buffer);
388 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
390 sprintf(number, "%d", event->request_code);
391 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
392 rxvt_warn ("(which is %s)\n", buffer);
393 if (event->request_code >= 128) {
394 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
395 mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
397 }
398 if ((event->error_code == BadWindow) ||
399 (event->error_code == BadPixmap) ||
400 (event->error_code == BadCursor) ||
401 (event->error_code == BadFont) ||
402 (event->error_code == BadDrawable) ||
403 (event->error_code == BadColor) ||
404 (event->error_code == BadGC) ||
405 (event->error_code == BadIDChoice) ||
406 (event->error_code == BadValue) ||
407 (event->error_code == BadAtom)) {
408 if (event->error_code == BadValue)
409 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
410 mesg, BUFSIZ);
411 else if (event->error_code == BadAtom)
412 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
413 mesg, BUFSIZ);
414 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422}
423#endif
424
425int
426rxvt_xerror_handler (Display *display, XErrorEvent *event)
427{
428 if (GET_R->allowedxerror == -1)
429 GET_R->allowedxerror = event->error_code;
430 else
431 {
432 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue
434#if ENABLE_FRILLS
435 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif
439 }
440
441 return 0;
442}
443
444int
445rxvt_xioerror_handler (Display *display)
446{
447 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
448 DisplayString (display));
449 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE);
451}
452
453/*----------------------------------------------------------------------*/
454bool
455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{
457 this->envv = envv;
458
459 SET_R (this);
460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
462
463 if (!init_vars ())
464 return false;
465
466 init_secondary ();
467
468 const char **cmd_argv = init_resources (argc, argv);
469
470#ifdef KEYSYM_RESOURCE
471 keyboard->register_done ();
472#endif
473
474#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */
477#endif
478
479 pty = ptytty_new ();
480
481 create_windows (argc, argv);
482
483 dDisp;
484
485 init_xlocale ();
486
487 scr_reset (); // initialize screen
488
489#if 0
490 XSynchronize (disp, True);
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */
496#endif
497#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent))
499 {
500 XSelectInput (disp, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root);
503 }
504#endif
505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
522 return true;
523}
524
525static struct sig_handlers
526{
527 sig_watcher sw_term, sw_int;
528
529 /*
530 * Catch a fatal signal and tidy up before quitting
531 */
507void 532 void
508rxvt_clean_exit () 533 sig_term (sig_watcher &w)
534 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term)
546 {
547 }
548} sig_handlers;
549
550char **rxvt_environ; // startup environment
551
552void
553rxvt_init ()
509{ 554{
510 // TODO: rxvtd should clean up all ressources 555 uid_t uid = getuid ();
511 if (GET_R) 556 gid_t gid = getgid ();
512 GET_R->destroy (); 557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585
586 rxvt_environ = environ;
587
588 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN);
590
591 sig_handlers.sw_term.start (SIGTERM);
592 sig_handlers.sw_int.start (SIGINT);
593
594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
595 /* signal (SIGURG, SIG_DFL); */
596
597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
598 // TODO: handle this with exceptions and tolerate the memory loss
599 XSetIOErrorHandler (rxvt_xioerror_handler);
600
601 XrmInitialize ();
513} 602}
514 603
515/* ------------------------------------------------------------------------- * 604/* ------------------------------------------------------------------------- *
516 * MEMORY ALLOCATION WRAPPERS * 605 * MEMORY ALLOCATION WRAPPERS *
517 * ------------------------------------------------------------------------- */ 606 * ------------------------------------------------------------------------- */
518/* INTPROTO */ 607void *
519void *
520rxvt_malloc (size_t size) 608rxvt_malloc (size_t size)
521{ 609{
522 void *p;
523
524 p = malloc (size); 610 void *p = malloc (size);
611
525 if (p) 612 if (!p)
526 return p;
527
528 rxvt_fatal ("memory allocation failure. aborting.\n"); 613 rxvt_fatal ("memory allocation failure. aborting.\n");
529 /* NOTREACHED */
530}
531 614
532/* INTPROTO */ 615 return p;
533void * 616}
617
618void *
534rxvt_calloc (size_t number, size_t size) 619rxvt_calloc (size_t number, size_t size)
535{ 620{
536 void *p;
537
538 p = calloc (number, size); 621 void *p = calloc (number, size);
622
539 if (p) 623 if (!p)
540 return p;
541
542 rxvt_fatal ("memory allocation failure. aborting.\n"); 624 rxvt_fatal ("memory allocation failure. aborting.\n");
543 /* NOTREACHED */
544}
545 625
546/* INTPROTO */ 626 return p;
547void * 627}
628
629void *
548rxvt_realloc (void *ptr, size_t size) 630rxvt_realloc (void *ptr, size_t size)
549{ 631{
550 void *p;
551
552 if (ptr)
553 p = realloc (ptr, size); 632 void *p = realloc (ptr, size);
554 else
555 p = malloc (size);
556 633
557 if (p) 634 if (!p)
558 return p;
559
560 rxvt_fatal ("memory allocation failure. aborting.\n"); 635 rxvt_fatal ("memory allocation failure. aborting.\n");
561 /* NOTREACHED */
562}
563 636
564/* ------------------------------------------------------------------------- *
565 * PRIVILEGED OPERATIONS *
566 * ------------------------------------------------------------------------- */
567/* take care of suid/sgid super-user (root) privileges */
568void
569rxvt_privileges (rxvt_privaction action)
570{
571#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
572 static uid_t euid;
573 static gid_t egid;
574#endif
575
576#if ! defined(__CYGWIN32__)
577# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
578 /* setreuid () is the poor man's setuid (), seteuid () */
579# define seteuid(a) setreuid(-1, (a))
580# define setegid(a) setregid(-1, (a))
581# define HAVE_SETEUID
582# endif
583# ifdef HAVE_SETEUID
584 switch (action)
585 {
586 case IGNORE:
587 /*
588 * change effective uid/gid - not real uid/gid - so we can switch
589 * back to root later, as required
590 */
591 seteuid (getuid ());
592 setegid (getgid ());
593 break;
594 case SAVE:
595 euid = geteuid ();
596 egid = getegid ();
597 break;
598 case RESTORE:
599 seteuid (euid);
600 setegid (egid);
601 break;
602 }
603# else
604 switch (action)
605 {
606 case IGNORE:
607 setuid (getuid ());
608 setgid (getgid ());
609 /* FALLTHROUGH */
610 case SAVE:
611 /* FALLTHROUGH */
612 case RESTORE:
613 break;
614 }
615# endif
616#endif
617}
618
619#ifdef UTMP_SUPPORT
620void
621rxvt_term::privileged_utmp (rxvt_privaction action)
622{
623 if ((options & Opt_utmpInhibit)
624 || !pty.name || !*pty.name)
625 return; 637 return p;
626
627 rxvt_privileges (RESTORE);
628
629 if (action == SAVE)
630 makeutent (pty.name, rs[Rs_display_name]);
631 else
632 cleanutent ();
633
634 rxvt_privileges (IGNORE);
635} 638}
636#endif
637 639
638/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
639/* 641/*
640 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculcations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
642 */ 644 */
643void 645void
644rxvt_term::window_calc (unsigned int width, unsigned int height) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 647{
646 short recalc_x, recalc_y; 648 short recalc_x, recalc_y;
647 int x, y, sb_w, mb_h, flags; 649 int x, y, sb_w, flags;
648 unsigned int w, h; 650 unsigned int w, h;
649 unsigned int max_width, max_height; 651 unsigned int max_width, max_height;
652 dDisp;
650 653
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 655 ncol, nrow, szHint.width, szHint.height));
653 szHint.height)); 656
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 658 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 660
658 recalc_x = recalc_y = 0; 661 recalc_x = recalc_y = 0;
659 flags = 0; 662 flags = 0;
663
660 if (!parsed_geometry) 664 if (!parsed_geometry)
661 { 665 {
662 parsed_geometry = 1; 666 parsed_geometry = 1;
667
663 if (rs[Rs_geometry]) 668 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670
665 if (flags & WidthValue) 671 if (flags & WidthValue)
666 { 672 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 674 szHint.flags |= USSize;
669 } 675 }
676
670 if (flags & HeightValue) 677 if (flags & HeightValue)
671 { 678 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 680 szHint.flags |= USSize;
674 } 681 }
682
675 if (flags & XValue) 683 if (flags & XValue)
676 { 684 {
677 szHint.x = x; 685 szHint.x = x;
678 szHint.flags |= USPosition; 686 szHint.flags |= USPosition;
687
679 if (flags & XNegative) 688 if (flags & XNegative)
680 { 689 {
681 recalc_x = 1; 690 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 691 szHint.win_gravity = NorthEastGravity;
683 } 692 }
684 } 693 }
694
685 if (flags & YValue) 695 if (flags & YValue)
686 { 696 {
687 szHint.y = y; 697 szHint.y = y;
688 szHint.flags |= USPosition; 698 szHint.flags |= USPosition;
699
689 if (flags & YNegative) 700 if (flags & YNegative)
690 { 701 {
691 recalc_y = 1; 702 recalc_y = 1;
703
692 if (szHint.win_gravity == NorthEastGravity) 704 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 705 szHint.win_gravity = SouthEastGravity;
694 else 706 else
695 szHint.win_gravity = SouthWestGravity; 707 szHint.win_gravity = SouthWestGravity;
696 } 708 }
697 } 709 }
698 } 710 }
699 711
700 /* TODO: BOUNDS */ 712 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 713 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 714 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 715 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 716 max_height = MAX_ROWS * fheight;
705 717
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 718 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 719
708 sb_w = mb_h = 0; 720 sb_w = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 721 window_vt_x = window_vt_y = int_bwidth;
710 722
711 if (scrollbar_visible ()) 723 if (scrollBar.state)
712 { 724 {
713 sb_w = scrollbar_TotalWidth (); 725 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 726 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 727 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 728 window_vt_x += sb_w;
717 } 729 }
718 730
719 if (menubar_visible ())
720 {
721 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h;
723 window_vt_y += mb_h;
724 }
725
726 szHint.width_inc = TermWin.fwidth; 731 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 732 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 733 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 734 szHint.min_height = szHint.base_height + szHint.height_inc;
730 735
731 if (width && width - szHint.base_width < max_width) 736 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 737 {
733 szHint.width = width; 738 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 739 width = newwidth - szHint.base_width;
735 } 740 }
736 else 741 else
737 { 742 {
738 MIN_IT (TermWin.width, max_width); 743 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 744 szHint.width = szHint.base_width + width;
740 } 745 }
741 746
742 if (height && height - szHint.base_height < max_height) 747 if (newheight && newheight - szHint.base_height < max_height)
743 { 748 {
744 szHint.height = height; 749 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 750 height = newheight - szHint.base_height;
746 } 751 }
747 else 752 else
748 { 753 {
749 MIN_IT (TermWin.height, max_height); 754 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 755 szHint.height = szHint.base_height + height;
751 } 756 }
752 757
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 758 if (scrollBar.state && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 759 window_sb_x = szHint.width - sb_w;
755 760
756 if (recalc_x) 761 if (recalc_x)
757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 763 if (recalc_y)
760 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 765
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 766 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 767 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width, 769 ncol, nrow, szHint.width,
767 szHint.height)); 770 szHint.height));
768 return; 771 return;
769} 772}
770 773
771/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
774 * Called after a window size change. 777 * Called after a window size change.
775 */ 778 */
776void 779void
777rxvt_term::tt_winch () 780rxvt_term::tt_winch ()
778{ 781{
779 if (pty.pty < 0) 782 if (pty->pty < 0)
780 return; 783 return;
781 784
782 struct winsize ws; 785 struct winsize ws;
783 786
784 ws.ws_col = TermWin.ncol; 787 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 788 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 789 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 790 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
789 792
790#if 0 793#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
794#endif 797#endif
795} 798}
796 799
797/*----------------------------------------------------------------------*/ 800/*----------------------------------------------------------------------*/
798/* rxvt_change_font () - Switch to a new font */ 801/* set_fonts () - load and set the various fonts
799/* 802 *
800 * init = 1 - initialize 803 * init = 1 - initialize
801 * 804 *
802 * fontname == FONT_UP - switch to bigger font 805 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 806 * fontname == FONT_DN - switch to smaller font
804 */ 807 */
805bool 808bool
806rxvt_term::change_font (const char *fontname) 809rxvt_term::set_fonts ()
807{ 810{
808 if (fontname == FONT_UP)
809 {
810 // TODO
811 }
812 else if (fontname == FONT_DN)
813 {
814 // TODO
815 }
816 else
817 {
818 rxvt_fontset *fs = new rxvt_fontset (this); 811 rxvt_fontset *fs = new rxvt_fontset (this);
812 rxvt_fontprop prop;
819 813
820 if (fs && fs->populate (fontname ? fontname : "fixed")) 814 if (!fs
815 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
816 || !fs->realize_font (1))
817 {
818 delete fs;
819 return false;
820 }
821
822#if ENABLE_STYLES
823 for (int i = RS_styleCount; --i; )
824 if (fontset[i] != fontset[0])
825 delete fontset[i];
826#endif
827
828 delete fontset[0];
829 fontset[0] = fs;
830
831 prop = (*fs)[1]->properties ();
832 prop.height += lineSpace;
833 fs->set_prop (prop);
834
835 fwidth = prop.width;
836 fheight = prop.height;
837 fbase = prop.ascent;
838
839 for (int style = 1; style < 4; style++)
840 {
841#if ENABLE_STYLES
842 const char *res = rs[Rs_font + style];
843
844 if (res && !*res)
845 fontset[style] = fontset[0];
846 else
821 { 847 {
822 delete TermWin.fontset; 848 fontset[style] = fs = new rxvt_fontset (this);
823 TermWin.fontset = fs; 849 rxvt_fontprop prop2 = prop;
824 TermWin.fwidth = fs->base_font ()->width;
825 TermWin.fheight = fs->base_font ()->height;
826 TermWin.fbase = fs->base_font ()->ascent;
827 850
828 if (TermWin.parent[0]) 851 if (res)
852 prop2.weight = prop2.slant = rxvt_fontprop::unset;
853 else
829 { 854 {
830 resize_all_windows (0, 0, 0); 855 res = fontset[0]->fontdesc;
831 scr_remap_chars (); 856
832 scr_touch (true); 857 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
858 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833 } 859 }
834 860
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 861 fs->populate (res);
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 862 fs->set_prop (prop2);
837
838 return true;
839 } 863 }
864#else
865 fontset[style] = fontset[0];
866#endif
867 }
868
869 if (parent[0])
840 } 870 {
871 resize_all_windows (0, 0, 0);
872 scr_remap_chars ();
873 scr_touch (true);
874 }
841 875
842 return false; 876 return true;
843} 877}
844 878
845bool 879void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846rxvt_term::font_up_down (int n, int direction)
847{ 880{
848 return false; 881 XChangeProperty (display->display, parent[0],
882 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884}
885
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{
888 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws);
890
891 XChangeProperty (display->display, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s));
894
895 free (s);
896 free (ws);
849} 897}
850 898
851/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
852/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
853/* xterm sequences - title, iconName, color (exptl) */ 901/* xterm sequences - title, iconName, color (exptl) */
854void 902void
855rxvt_term::set_title (const char *str) 903rxvt_term::set_title (const char *str)
856{ 904{
857#ifdef SMART_WINDOW_TITLE 905 set_string_property (XA_WM_NAME, str);
858 char *name; 906#if ENABLE_EWMH
859 907 set_utf8_property (xa[XA_NET_WM_NAME], str);
860 if (!XFetchName (display->display, TermWin.parent[0], &name))
861 name = NULL;
862
863 if (name == NULL || strcmp (name, str))
864#endif
865 XStoreName (display->display, TermWin.parent[0], str);
866
867#ifdef SMART_WINDOW_TITLE
868 if (name)
869 XFree (name);
870#endif 908#endif
871} 909}
872 910
873void 911void
874rxvt_term::set_icon_name (const char *str) 912rxvt_term::set_icon_name (const char *str)
875{ 913{
876#ifdef SMART_WINDOW_TITLE 914 set_string_property (XA_WM_ICON_NAME, str);
877 char *name; 915#if ENABLE_EWMH
878 916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
879 if (!XGetIconName (display->display, TermWin.parent[0], &name))
880 name = NULL;
881
882 if (name == NULL || strcmp (name, str))
883#endif
884 XSetIconName (display->display, TermWin.parent[0], str);
885
886#ifdef SMART_WINDOW_TITLE
887 if (name)
888 XFree (name);
889#endif 917#endif
890} 918}
891 919
892#ifdef XTERM_COLOR_CHANGE 920#ifdef XTERM_COLOR_CHANGE
893void 921void
901 929
902 /* handle color aliases */ 930 /* handle color aliases */
903 if (isdigit (*color)) 931 if (isdigit (*color))
904 { 932 {
905 i = atoi (color); 933 i = atoi (color);
934
906 if (i >= 8 && i <= 15) 935 if (i >= 8 && i <= 15)
907 { /* bright colors */ 936 { /* bright colors */
908 i -= 8; 937 i -= 8;
909# ifndef NO_BRIGHTCOLOR
910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
911 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
912 goto Done; 940 goto done;
913# endif
914
915 } 941 }
942
916 if (i >= 0 && i <= 7) 943 if (i >= 0 && i <= 7)
917 { /* normal colors */ 944 { /* normal colors */
918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
919 SET_PIXCOLOR (idx); 946 SET_PIXCOLOR (idx);
920 goto Done; 947 goto done;
921 } 948 }
922 } 949 }
923 950
924 if (!rXParseAllocColor (& xcol, color)) 951 if (!rXParseAllocColor (&xcol, color))
925 return; 952 return;
926 953
927 /* XStoreColor (display->display, display->cmap, XColor*); */ 954 /* XStoreColor (display->display, display->cmap, XColor*); */
928 955
929 /* 956 /*
945 pix_colors_focused[idx] = xcol; 972 pix_colors_focused[idx] = xcol;
946 SET_PIXCOLOR (idx); 973 SET_PIXCOLOR (idx);
947 974
948 /* XSetWindowAttributes attr; */ 975 /* XSetWindowAttributes attr; */
949 /* Cursor cursor; */ 976 /* Cursor cursor; */
950Done: 977done:
978
951#ifdef OFF_FOCUS_FADING 979#if OFF_FOCUS_FADING
980 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif 982#endif
954 if (idx == Color_bg && ! (options & Opt_transparent))
955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956 983
957 /* handle Color_BD, scrollbar background, etc. */ 984 /*TODO: handle Color_BD, scrollbar background, etc. */
958 985
959 set_colorfgbg ();
960 recolour_cursor (); 986 recolour_cursor ();
961 scr_touch (true); 987 scr_recolour ();
962} 988}
963 989
964#else 990#else
965# define set_window_color (idx,color) ((void)0) 991# define set_window_color (idx,color) ((void)0)
966#endif /* XTERM_COLOR_CHANGE */ 992#endif /* XTERM_COLOR_CHANGE */
968void 994void
969rxvt_term::recolour_cursor () 995rxvt_term::recolour_cursor ()
970{ 996{
971 XColor xcol[2]; 997 XColor xcol[2];
972 998
973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg]; 999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
974 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg]; 1000 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg];
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg];
1005
975 XQueryColors (display->display, display->cmap, xcol, 2); 1006 XQueryColors (display->display, display->cmap, xcol, 2);
976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977} 1008}
978 1009
979/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
981 * find if fg/bg matches any of the normal (low-intensity) colors 1012 * find if fg/bg matches any of the normal (low-intensity) colors
982 */ 1013 */
983void 1014void
984rxvt_term::set_colorfgbg () 1015rxvt_term::set_colorfgbg ()
985{ 1016{
986 unsigned int i; 1017 unsigned int i;
987 const char *xpmb = "\0"; 1018 const char *xpmb = "\0";
988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989 1020
990 env_colorfgbg =
991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1022 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1023 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1024 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1025 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1026 {
997 sprintf (fstr, "%d", (i - Color_Black)); 1027 sprintf (fstr, "%d", (i - Color_Black));
998 break; 1028 break;
999 } 1029 }
1030
1000 for (i = Color_Black; i <= Color_White; i++) 1031 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1032 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1033 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1034 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
1006#endif 1037#endif
1007 break; 1038 break;
1008 } 1039 }
1009 1040
1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1011
1012#ifndef NO_BRIGHTCOLOR
1013 colorfgbg = DEFAULT_RSTYLE;
1014 for (i = minCOLOR; i <= maxCOLOR; i++)
1015 {
1016 if (pix_colors[Color_fg] == pix_colors[i])
1017 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1018 if (pix_colors[Color_bg] == pix_colors[i])
1019 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1020 }
1021#endif
1022} 1042}
1023 1043
1024/*----------------------------------------------------------------------*/ 1044/*----------------------------------------------------------------------*/
1025/*
1026 * Colour determination for low colour displays, routine from
1027 * Hans de Goede <hans@highrise.nl>
1028 */
1029 1045
1030int 1046int
1031rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1032{ 1048{
1033 if (!screen_in_out->set (display, colour)) 1049 if (!screen_in_out->set (display, colour))
1041 1057
1042/* -------------------------------------------------------------------- * 1058/* -------------------------------------------------------------------- *
1043 * - WINDOW RESIZING - * 1059 * - WINDOW RESIZING - *
1044 * -------------------------------------------------------------------- */ 1060 * -------------------------------------------------------------------- */
1045void 1061void
1046rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1047{ 1063{
1048 int fix_screen; 1064 int fix_screen;
1049
1050#ifdef SMART_RESIZE
1051 int old_width = szHint.width, old_height = szHint.height; 1065 int old_width = szHint.width, old_height = szHint.height;
1052#endif 1066 dDisp;
1053 1067
1054 window_calc (width, height); 1068 window_calc (newwidth, newheight);
1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1069 XSetWMNormalHints (disp, parent[0], &szHint);
1056 1070
1057 if (!ignoreparent) 1071 if (!ignoreparent)
1058 { 1072 {
1059#ifdef SMART_RESIZE 1073#ifdef SMART_RESIZE
1060 /* 1074 /*
1064 int x, y, x1, y1; 1078 int x, y, x1, y1;
1065 int dx, dy; 1079 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1081 Window unused_cr;
1068 1082
1069 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1083 XTranslateCoordinates (disp, parent[0], display->root,
1070 0, 0, &x, &y, &unused_cr); 1084 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1087 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1088 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1089 * our position for handles and decorations. Counter it
1076 */ 1090 */
1078 { 1092 {
1079 x -= x1; 1093 x -= x1;
1080 y -= y1; 1094 y -= y1;
1081 } 1095 }
1082 1096
1083 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1084 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1085 dx = old_width - szHint.width; 1099 dx = old_width - szHint.width;
1086 dy = old_height - szHint.height; 1100 dy = old_height - szHint.height;
1087 1101
1088 /* Check position of the center of the window */ 1102 /* Check position of the center of the window */
1089 if (x < x1) /* left half */ 1103 if (x < x1) /* left half */
1093 if (y < y1) /* top half */ 1107 if (y < y1) /* top half */
1094 dy = 0; 1108 dy = 0;
1095 else if (y == y1) /* exact center */ 1109 else if (y == y1) /* exact center */
1096 dy /= 2; 1110 dy /= 2;
1097 1111
1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1099 szHint.width, szHint.height); 1113 szHint.width, szHint.height);
1100#else 1114#else
1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1102#endif 1116#endif
1103 } 1117 }
1104 1118
1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 1120
1107 if (fix_screen || width != old_width || height != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 1122 {
1109 if (scrollbar_visible ()) 1123 if (scrollBar.state)
1110 { 1124 {
1111 XMoveResizeWindow (display->display, scrollBar.win, 1125 XMoveResizeWindow (disp, scrollBar.win,
1112 window_sb_x, 0, 1126 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height); 1127 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar (); 1128 resize_scrollbar ();
1115 } 1129 }
1116 1130
1117 if (menubar_visible ())
1118 XMoveResizeWindow (display->display, menuBar.win,
1119 window_vt_x, 0,
1120 TermWin_TotalWidth (), menuBar_TotalHeight ());
1121
1122 XMoveResizeWindow (display->display, TermWin.vt, 1131 XMoveResizeWindow (disp, vt,
1123 window_vt_x, window_vt_y, 1132 window_vt_x, window_vt_y,
1124 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1133 width, height);
1134
1125 scr_clear (); 1135 scr_clear ();
1126#ifdef XPM_BACKGROUND 1136#ifdef XPM_BACKGROUND
1127 resize_pixmap (); 1137 resize_pixmap ();
1128#endif 1138#endif
1129 } 1139 }
1134 int old_ncol = prev_ncol; 1144 int old_ncol = prev_ncol;
1135 1145
1136 /* scr_reset only works on the primary screen */ 1146 /* scr_reset only works on the primary screen */
1137 if (old_height) /* this is not the first time through */ 1147 if (old_height) /* this is not the first time through */
1138 { 1148 {
1139 unsigned int ncol = TermWin.ncol; 1149 unsigned int ocol = ncol;
1140 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1141 curr_screen = scr_change_screen (PRIMARY); 1151 curr_screen = scr_change_screen (PRIMARY);
1142 TermWin.ncol = ncol; 1152 ncol = ocol;
1143 } 1153 }
1144 1154
1145 scr_reset (); 1155 scr_reset ();
1146 1156
1147 if (curr_screen >= 0) /* this is not the first time through */ 1157 if (curr_screen >= 0) /* this is not the first time through */
1148 { 1158 {
1149 scr_change_screen (curr_screen); 1159 scr_change_screen (curr_screen);
1150 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1160 selection_check (old_ncol != ncol ? 4 : 0);
1151 } 1161 }
1152 } 1162 }
1153 1163
1154 old_width = szHint.width; 1164 old_width = szHint.width;
1155 old_height = szHint.height; 1165 old_height = szHint.height;
1166
1167#ifdef XPM_BACKGROUND
1168 if (pixmap)
1169 scr_touch (false);
1170#endif
1156 1171
1157#ifdef USE_XIM 1172#ifdef USE_XIM
1158 IMSetStatusPosition (); 1173 IMSetStatusPosition ();
1159#endif 1174#endif
1160} 1175}
1162/* 1177/*
1163 * Set the width/height of the vt window in characters. Units are pixels. 1178 * Set the width/height of the vt window in characters. Units are pixels.
1164 * good for toggling 80/132 columns 1179 * good for toggling 80/132 columns
1165 */ 1180 */
1166void 1181void
1167rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1182rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1168{ 1183{
1169 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1170 1185
1171 if (width == 0 || height == 0) 1186 if (newwidth == 0 || newheight == 0)
1172 { 1187 {
1173 XGetWindowAttributes (display->display, display->root, &wattr); 1188 XGetWindowAttributes (display->display, display->root, &wattr);
1189
1174 if (width == 0) 1190 if (newwidth == 0)
1175 width = wattr.width - szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
1176 if (height == 0) 1192 if (newheight == 0)
1177 height = wattr.height - szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
1178 }
1179
1180 if (width != TermWin.width || height != TermWin.height)
1181 { 1194 }
1195
1196 if (newwidth != width || newheight != height)
1197 {
1182 width += szHint.base_width; 1198 newwidth += szHint.base_width;
1183 height += szHint.base_height; 1199 newheight += szHint.base_height;
1184 resize_all_windows (width, height, 0); 1200 resize_all_windows (newwidth, newheight, 0);
1185 } 1201 }
1186} 1202}
1187 1203
1188/* -------------------------------------------------------------------- * 1204/* -------------------------------------------------------------------- *
1189 * - X INPUT METHOD ROUTINES - * 1205 * - X INPUT METHOD ROUTINES - *
1199 1215
1200void 1216void
1201rxvt_term::im_set_size (XRectangle &size) 1217rxvt_term::im_set_size (XRectangle &size)
1202{ 1218{
1203 // the int_bwidth terms make no sense to me 1219 // the int_bwidth terms make no sense to me
1204 size.x = TermWin.int_bwidth; 1220 size.x = int_bwidth;
1205 size.y = TermWin.int_bwidth; 1221 size.y = int_bwidth;
1206 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1222 size.width = Width2Pixel (ncol) + int_bwidth;
1207 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1223 size.height = Height2Pixel (nrow) + int_bwidth;
1208} 1224}
1209 1225
1210void 1226void
1211rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1227rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1212 XRectangle &status_rect, 1228 XRectangle &status_rect,
1213 const XRectangle &needed_rect) 1229 const XRectangle &needed_rect)
1214{ 1230{
1215 preedit_rect.x = needed_rect.width; 1231 preedit_rect.x = needed_rect.width;
1216 preedit_rect.y = 0; 1232 preedit_rect.y = 0;
1217 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1233 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1218 preedit_rect.height = TermWin.fheight; 1234 preedit_rect.height = fheight;
1219 1235
1220 status_rect.x = 0; 1236 status_rect.x = 0;
1221 status_rect.y = 0; 1237 status_rect.y = 0;
1222 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1238 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1223 status_rect.height = TermWin.fheight; 1239 status_rect.height = fheight;
1224} 1240}
1225 1241
1226/* Checking whether input method is running. */ 1242/* Checking whether input method is running. */
1227bool 1243bool
1228rxvt_term::IMisRunning () 1244rxvt_term::IMisRunning ()
1252} 1268}
1253 1269
1254void 1270void
1255rxvt_term::IMSendSpot () 1271rxvt_term::IMSendSpot ()
1256{ 1272{
1257 XPoint spot; 1273 XPoint nspot;
1258 XVaNestedList preedit_attr; 1274 XVaNestedList preedit_attr;
1259 1275
1260 if (!Input_Context 1276 if (!Input_Context
1261 || !TermWin.focus 1277 || !focus
1262 || !(input_style & XIMPreeditPosition) 1278 || !(input_style & XIMPreeditPosition))
1263#if 0
1264 || !(event_type == KeyPress
1265 || event_type == Expose
1266 || event_type == NoExpose
1267 || event_type == SelectionNotify
1268 || event_type == ButtonRelease || event_type == FocusIn)
1269#endif
1270 || !IMisRunning ())
1271 return; 1279 return;
1272 1280
1273 im_set_position (spot); 1281 im_set_position (nspot);
1282
1283 if (nspot.x == spot.x && nspot.y == spot.y)
1284 return;
1285
1286 spot = nspot;
1274 1287
1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1288 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1289 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277 XFree (preedit_attr); 1290 XFree (preedit_attr);
1278} 1291}
1279 1292
1280void 1293void
1281rxvt_term::im_destroy () 1294rxvt_term::im_destroy ()
1282{ 1295{
1283 if (Input_Context)
1284 {
1285 XDestroyIC (Input_Context);
1286 Input_Context = 0;
1287 }
1288
1289 if (input_method) 1296 if (input_method)
1290 { 1297 {
1298 if (Input_Context && input_method->xim)
1299 XDestroyIC (Input_Context);
1300
1291 display->put_xim (input_method); 1301 display->put_xim (input_method);
1292 input_method = 0; 1302 input_method = 0;
1293 } 1303 }
1304
1305 Input_Context = 0;
1294} 1306}
1295 1307
1296/* 1308/*
1297 * Try to open a XIM with the current modifiers, then see if we can 1309 * Try to open a XIM with the current modifiers, then see if we can
1298 * open a suitable preedit type 1310 * open a suitable preedit type
1307 unsigned long fg, bg; 1319 unsigned long fg, bg;
1308 const char *p; 1320 const char *p;
1309 char **s; 1321 char **s;
1310 XIMStyles *xim_styles; 1322 XIMStyles *xim_styles;
1311 1323
1324 set_environ (envv);
1325
1312 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1313 return false; 1327 return false;
1314 1328
1315 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1316 input_method = display->get_xim (locale, modifiers); 1330 input_method = display->get_xim (locale, modifiers);
1317 if (input_method == NULL) 1331 if (input_method == NULL)
1318 return false; 1332 return false;
1319 1333
1320 xim = input_method->xim; 1334 xim = input_method->xim;
1335 spot.x = spot.y = -1;
1321 1336
1322 xim_styles = NULL; 1337 xim_styles = NULL;
1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1338 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324 || !xim_styles || !xim_styles->count_styles) 1339 || !xim_styles || !xim_styles->count_styles)
1325 { 1340 {
1326 im_destroy (); 1341 im_destroy ();
1327 return false; 1342 return false;
1328 } 1343 }
1329 1344
1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1345 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1346
1347 for (int pi = 0; pi < 2; pi++)
1348 {
1349 p = pet[pi];
1350
1351 if (!p)
1352 continue;
1353
1331 s = rxvt_splitcommastring (p); 1354 s = rxvt_splitcommastring (p);
1332 1355
1333 for (i = found = 0; !found && s[i]; i++) 1356 for (i = found = 0; !found && s[i]; i++)
1334 { 1357 {
1335 if (!strcmp (s[i], "OverTheSpot")) 1358 if (!strcmp (s[i], "OverTheSpot"))
1336 input_style = (XIMPreeditPosition | XIMStatusNothing); 1359 input_style = (XIMPreeditPosition | XIMStatusNothing);
1337 else if (!strcmp (s[i], "OffTheSpot")) 1360 else if (!strcmp (s[i], "OffTheSpot"))
1338 input_style = (XIMPreeditArea | XIMStatusArea); 1361 input_style = (XIMPreeditArea | XIMStatusArea);
1339 else if (!strcmp (s[i], "Root")) 1362 else if (!strcmp (s[i], "Root"))
1340 input_style = (XIMPreeditNothing | XIMStatusNothing); 1363 input_style = (XIMPreeditNothing | XIMStatusNothing);
1364 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone);
1341 1366
1342 for (j = 0; j < xim_styles->count_styles; j++) 1367 for (j = 0; j < xim_styles->count_styles; j++)
1343 if (input_style == xim_styles->supported_styles[j]) 1368 if (input_style == xim_styles->supported_styles[j])
1344 { 1369 {
1370 rxvt_freecommastring (s);
1371
1345 found = 1; 1372 found = 1;
1346 break; 1373 goto foundpet;
1374 }
1375
1347 } 1376 }
1348 }
1349 1377
1350 for (i = 0; s[i]; i++) 1378 rxvt_freecommastring (s);
1351 free (s[i]); 1379 }
1352 1380
1353 free (s); 1381foundpet:
1382
1354 XFree (xim_styles); 1383 XFree (xim_styles);
1355 1384
1356 if (!found) 1385 if (!found)
1357 { 1386 {
1358 im_destroy (); 1387 im_destroy ();
1375 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1404 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1376 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1405 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1377 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1406 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1378 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1407 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1379 "*", 1408 "*",
1380 TermWin.fheight, 1409 fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1, 1410 fheight + 1, fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2); 1411 fheight - 2, fheight + 2);
1383 1412
1384 fs = XCreateFontSet (display->display, pat, 1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1385 &missing_charset_list, &missing_charset_count, &def_string); 1414 &missing_charset_list, &missing_charset_count, &def_string);
1386 1415
1387 if (missing_charset_list) 1416 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list); 1417 XFreeStringList (missing_charset_list);
1389 1418
1433 NULL); 1462 NULL);
1434 } 1463 }
1435 1464
1436 Input_Context = XCreateIC (xim, 1465 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style, 1466 XNInputStyle, input_style,
1438 XNClientWindow, TermWin.vt, 1467 XNClientWindow, vt,
1439 XNFocusWindow, TermWin.parent[0], 1468 XNFocusWindow, parent[0],
1440 preedit_attr ? XNPreeditAttributes : NULL, 1469 preedit_attr ? XNPreeditAttributes : NULL,
1441 preedit_attr, 1470 preedit_attr,
1442 status_attr ? XNStatusAttributes : NULL, 1471 status_attr ? XNStatusAttributes : NULL,
1443 status_attr, NULL); 1472 status_attr, NULL);
1444 1473
1461} 1490}
1462 1491
1463void 1492void
1464rxvt_term::im_cb () 1493rxvt_term::im_cb ()
1465{ 1494{
1466 int i, found, had_im; 1495 int i;
1467 const char *p; 1496 const char *p;
1468 char **s; 1497 char **s;
1469 char buf[IMBUFSIZ]; 1498 char buf[IMBUFSIZ];
1470 1499
1500 make_current ();
1501
1471 im_destroy (); 1502 im_destroy ();
1472 1503
1473 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1474 if (Input_Context) 1505 if (Input_Context)
1475 return; 1506 return;
1483 if (p && *p) 1514 if (p && *p)
1484 { 1515 {
1485 bool found = false; 1516 bool found = false;
1486 1517
1487 s = rxvt_splitcommastring (p); 1518 s = rxvt_splitcommastring (p);
1519
1488 for (i = 0; s[i]; i++) 1520 for (i = 0; s[i]; i++)
1489 { 1521 {
1490 if (*s[i]) 1522 if (*s[i])
1491 { 1523 {
1492 strcpy (buf, "@im="); 1524 strcpy (buf, "@im=");
1496 found = true; 1528 found = true;
1497 break; 1529 break;
1498 } 1530 }
1499 } 1531 }
1500 } 1532 }
1501 for (i = 0; s[i]; i++) 1533
1502 free (s[i]); 1534 rxvt_freecommastring (s);
1503 free (s);
1504 1535
1505 if (found) 1536 if (found)
1506 goto done; 1537 goto done;
1507 } 1538 }
1508 1539
1526{ 1557{
1527 XRectangle preedit_rect, status_rect, *needed_rect; 1558 XRectangle preedit_rect, status_rect, *needed_rect;
1528 XVaNestedList preedit_attr, status_attr; 1559 XVaNestedList preedit_attr, status_attr;
1529 1560
1530 if (!Input_Context 1561 if (!Input_Context
1531 || !TermWin.focus 1562 || !focus
1532 || !(input_style & XIMPreeditArea) 1563 || !(input_style & XIMPreeditArea)
1533 || !IMisRunning ()) 1564 || !IMisRunning ())
1534 return; 1565 return;
1535 1566
1536 /* Getting the necessary width of preedit area */ 1567 /* Getting the necessary width of preedit area */
1551 XFree (preedit_attr); 1582 XFree (preedit_attr);
1552 XFree (status_attr); 1583 XFree (status_attr);
1553} 1584}
1554#endif /* USE_XIM */ 1585#endif /* USE_XIM */
1555 1586
1556/*----------------------------------------------------------------------*/
1557rxvt_t rxvt_current_term;
1558
1559/*----------------------- end-of-file (C source) -----------------------*/ 1587/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines