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.60 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines