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.22 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.67 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines