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.73 by root, Fri Jul 30 14:59:12 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines