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.23 by pcg, Sat Jan 31 03:18:43 2004 UTC vs.
Revision 1.73 by root, Fri Jul 30 14:59:12 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines