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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines