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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines