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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines