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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines