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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines