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

Diff Legend

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