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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines