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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines