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.12 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.65 by pcg, Fri Apr 2 15:15:26 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines