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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.66 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines