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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines