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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines