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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.66 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines