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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines