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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines