[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.301 by ayin, Sat Jan 19 13:00:10 2008 UTC vs.
Revision 1.370 by sf-exg, Thu Jan 19 15:08:55 2012 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <assert.h>
40	#include <csignal>	42	#include <signal.h>
41	#include <cstring>	43	#include <string.h>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
45	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
46	# define X_LOCALE	48	# define X_LOCALE
47	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
48	#else	50	#else
49	# ifdef HAVE_SETLOCALE
50	# include <clocale>	51	# include <locale.h>
51	# endif	52	#endif
52	#endif
53		53
		54	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	55	vector<rxvt_term *> rxvt_term::termlist;
55		56
56	// used to tell global functions which terminal instance is "active"	57	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	58	rxvt_t rxvt_current_term;
58		59
…		…
93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	94	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94	{	95	{
95	compose_char *cc;	96	compose_char *cc;
96		97
97	// break compose chains, as stupid readline really likes to duplicate	98	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	99	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	100	cc = (*this)[c1];
100	while (cc)	101	while (cc)
101	{	102	{
102	if (cc->c2 == c2) return c1;	103	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	104	cc = (*this)[cc->c1];
104	}	105	}
105		106
106	// check to see wether this combination already exists otherwise	107	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	108	for (cc = v.begin (); cc < v.end (); cc++)
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	109	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	110	return COMPOSE_LO + (cc - v.begin ());
111	}
112		111
113	// allocate a new combination	112	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	113	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	114	{
116	static int seen;	115	static int seen;
117		116
118	if (!seen++)	117	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	118	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		119
121	return REPLACEMENT_CHAR;	120	return REPLACEMENT_CHAR;
122	}	121	}
123		122
124	v.push_back (compose_char (c1, c2));	123	v.push_back (compose_char (c1, c2));
…		…
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	171	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	172	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	173	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	175	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	177	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	179	#endif
183	#ifdef POINTER_BLANK	180	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	181	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
188	#endif	185	#endif
189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	186	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	187	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	188	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	189	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	190	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	191	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196		192
197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	193	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198		194
…		…
227	delete fontset[i];	223	delete fontset[i];
228	#endif	224	#endif
229	delete fontset[0];	225	delete fontset[0];
230		226
231	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
232	bgPixmap.destroy ();	228	bg_destroy ();
233	#endif	229	#endif
234		230
235	if (display)	231	if (display)
236	{	232	{
237	selection_clear ();	233	selection_clear ();
		234	selection_clear (true);
238		235
239	#ifdef USE_XIM	236	#ifdef USE_XIM
240	im_destroy ();	237	im_destroy ();
241	#endif	238	#endif
242	#ifdef XTERM_SCROLLBAR	239	scrollBar.destroy ();
243	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244	if (ShadowGC) XFreeGC (dpy, ShadowGC);
245	#endif
246	#ifdef PLAIN_SCROLLBAR
247	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248	#endif
249	#ifdef NEXT_SCROLLBAR
250	if (blackGC) XFreeGC (dpy, blackGC);
251	if (whiteGC) XFreeGC (dpy, whiteGC);
252	if (grayGC) XFreeGC (dpy, grayGC);
253	if (darkGC) XFreeGC (dpy, darkGC);
254	if (stippleGC) XFreeGC (dpy, stippleGC);
255	if (dimple) XFreePixmap (dpy, dimple);
256	if (upArrow) XFreePixmap (dpy, upArrow);
257	if (downArrow) XFreePixmap (dpy, downArrow);
258	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260	#endif
261	#ifdef RXVT_SCROLLBAR
262	if (topShadowGC) XFreeGC (dpy, topShadowGC);
263	if (botShadowGC) XFreeGC (dpy, botShadowGC);
264	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265	#endif
266	if (gc) XFreeGC (dpy, gc);	240	if (gc) XFreeGC (dpy, gc);
267		241
268	delete drawable;	242	delete drawable;
269	// destroy all windows	243	// destroy all windows
270	if (parent[0])	244	if (parent)
271	XDestroyWindow (dpy, parent[0]);	245	XDestroyWindow (dpy, parent);
272		246
273	for (int i = 0; i < TOTAL_COLORS; i++)	247	for (int i = 0; i < TOTAL_COLORS; i++)
274	if (ISSET_PIXCOLOR (i))	248	if (ISSET_PIXCOLOR (i))
275	{	249	{
276	pix_colors_focused [i].free (this);	250	pix_colors_focused [i].free (this);
…		…
290	/* clear all resources */	264	/* clear all resources */
291	for (int i = 0; i < allocated.size (); i++)	265	for (int i = 0; i < allocated.size (); i++)
292	free (allocated [i]);	266	free (allocated [i]);
293		267
294	free (selection.text);	268	free (selection.text);
295	// TODO: manage env vars in child only(!)	269	free (selection.clip_text);
296	free (env_display);
297	free (env_term);
298	free (locale);	270	free (locale);
299	free (v_buffer);	271	free (v_buffer);
300	free (incr_buf);	272
		273	delete selection_req;
301		274
302	delete envv;	275	delete envv;
303	delete argv;	276	delete argv;
304		277
305	#ifdef KEYSYM_RESOURCE	278	#ifdef KEYSYM_RESOURCE
…		…
337	if (display)	310	if (display)
338	{	311	{
339	#if USE_XIM	312	#if USE_XIM
340	im_ev.stop (display);	313	im_ev.stop (display);
341	#endif	314	#endif
342	#if HAVE_SCROLLBARS
343	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
344	#endif
345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	316	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
346	rootwin_ev.stop (display);	317	rootwin_ev.stop (display);
347	#endif	318	#endif
348	incr_ev.stop ();
349	termwin_ev.stop (display);	319	termwin_ev.stop (display);
350	vt_ev.stop (display);	320	vt_ev.stop (display);
351	}	321	}
352		322
353	flush_ev.stop ();	323	flush_ev.stop ();
…		…
375	rxvt_term::destroy_cb (ev::idle &w, int revents)	345	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	346	{
377	make_current ();	347	make_current ();
378		348
379	delete this;	349	delete this;
		350	}
		351
		352	void
		353	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
		354	{
		355	if (!opt)
		356	return;
		357
		358	uint8_t mask = 1 << (opt & 7);
		359	uint8_t &val = options [opt >> 3];
		360
		361	val = val & ~mask \| (set ? mask : 0);
380	}	362	}
381		363
382	/----------------------------------------------------------------------/	364	/----------------------------------------------------------------------/
383	/*	365	/*
384	* Exit gracefully, clearing the utmp entry and restoring tty attributes	366	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
398	print_x_error (Display dpy, XErrorEvent event)	380	print_x_error (Display dpy, XErrorEvent event)
399	{	381	{
400	char buffer[BUFSIZ];	382	char buffer[BUFSIZ];
401	char mesg[BUFSIZ];	383	char mesg[BUFSIZ];
402	char number[32];	384	char number[32];
403	char *mtype = "XlibMessage";	385	const char mtype[] = "XlibMessage";
404	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406	rxvt_warn ("An X Error occured, trying to continue after report.\n");	388	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407	rxvt_warn ("%s: %s\n", mesg, buffer);	389	rxvt_warn ("%s: %s\n", mesg, buffer);
408	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	391	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410	sprintf(number, "%d", event->request_code);	392	sprintf(number, "%d", event->request_code);
411	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	393	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412	rxvt_warn ("(which is %s)\n", buffer);	394	rxvt_warn ("(which is %s)\n", buffer);
413	if (event->request_code >= 128) {	395	if (event->request_code >= 128) {
414	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	396	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415	mesg, BUFSIZ);	397	mesg, BUFSIZ);
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	398	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417	}	399	}
418	if ((event->error_code == BadWindow) \|\|	400	if ((event->error_code == BadWindow) \|\|
419	(event->error_code == BadPixmap) \|\|	401	(event->error_code == BadPixmap) \|\|
420	(event->error_code == BadCursor) \|\|	402	(event->error_code == BadCursor) \|\|
421	(event->error_code == BadFont) \|\|	403	(event->error_code == BadFont) \|\|
422	(event->error_code == BadDrawable) \|\|	404	(event->error_code == BadDrawable) \|\|
423	(event->error_code == BadColor) \|\|	405	(event->error_code == BadColor) \|\|
424	(event->error_code == BadGC) \|\|	406	(event->error_code == BadGC) \|\|
425	(event->error_code == BadIDChoice) \|\|	407	(event->error_code == BadIDChoice) \|\|
426	(event->error_code == BadValue) \|\|	408	(event->error_code == BadValue) \|\|
427	(event->error_code == BadAtom)) {	409	(event->error_code == BadAtom)) {
428	if (event->error_code == BadValue)	410	if (event->error_code == BadValue)
429	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	411	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430	mesg, BUFSIZ);	412	mesg, BUFSIZ);
431	else if (event->error_code == BadAtom)	413	else if (event->error_code == BadAtom)
432	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	414	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433	mesg, BUFSIZ);	415	mesg, BUFSIZ);
434	else	416	else
435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436	mesg, BUFSIZ);	418	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	419	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438	}	420	}
439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	421	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440	mesg, BUFSIZ);	422	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442	}	424	}
443	#endif	425	#endif
444		426
445	int	427	int
…		…
492	rxvt_emergency_cleanup ();	474	rxvt_emergency_cleanup ();
493	w.stop ();	475	w.stop ();
494	kill (getpid (), w.signum);	476	kill (getpid (), w.signum);
495	}	477	}
496		478
		479	static void
		480	rxvt_get_ttymode (struct termios *tio)
		481	{
		482	if (tcgetattr (STDIN_FILENO, tio) < 0)
		483	memset (tio, 0, sizeof (struct termios));
		484
		485	for (int i = 0; i < NCCS; i++)
		486	tio->c_cc[i] = VDISABLE;
		487
		488	tio->c_cc[VINTR] = CINTR;
		489	tio->c_cc[VQUIT] = CQUIT;
		490	tio->c_cc[VERASE] = CERASE;
		491	#ifdef VERASE2
		492	tio->c_cc[VERASE2] = CERASE2;
		493	#endif
		494	tio->c_cc[VKILL] = CKILL;
		495	tio->c_cc[VEOF] = CEOF;
		496	tio->c_cc[VSTART] = CSTART;
		497	tio->c_cc[VSTOP] = CSTOP;
		498	tio->c_cc[VSUSP] = CSUSP;
		499	# ifdef VDSUSP
		500	tio->c_cc[VDSUSP] = CDSUSP;
		501	# endif
		502	# ifdef VREPRINT
		503	tio->c_cc[VREPRINT] = CRPRNT;
		504	# endif
		505	# ifdef VDISCRD
		506	tio->c_cc[VDISCRD] = CFLUSH;
		507	# endif
		508	# ifdef VWERSE
		509	tio->c_cc[VWERSE] = CWERASE;
		510	# endif
		511	# ifdef VLNEXT
		512	tio->c_cc[VLNEXT] = CLNEXT;
		513	# endif
		514	# ifdef VSTATUS
		515	tio->c_cc[VSTATUS] = CSTATUS;
		516	# endif
		517
		518	# if VMIN != VEOF
		519	tio->c_cc[VMIN] = 1;
		520	# endif
		521	# if VTIME != VEOL
		522	tio->c_cc[VTIME] = 0;
		523	# endif
		524
		525	/* input modes */
		526	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		527	# ifdef IMAXBEL
		528	\| IMAXBEL
		529	# endif
		530	\| IXON);
		531
		532	/* output modes */
		533	tio->c_oflag = (OPOST \| ONLCR);
		534
		535	/* control modes */
		536	tio->c_cflag = (CS8 \| CREAD);
		537
		538	/* local modes */
		539	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		540	# if defined (ECHOCTL) && defined (ECHOKE)
		541	\| ECHOCTL \| ECHOKE
		542	# endif
		543	\| ECHOE \| ECHOK);
		544	}
		545
497	char **rxvt_environ; // startup environment	546	char **rxvt_environ; // startup environment
498		547
499	void	548	void
500	rxvt_init ()	549	rxvt_init ()
501	{	550	{
502	ptytty::init ();	551	assert (("fontMask must not overlap other RS masks",
		552	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
503		553
		554	rxvt_get_ttymode (&rxvt_term::def_tio);
		555
		556	// get rid of stdin/stdout as we don't need them, to free resources
		557	dup2 (STDERR_FILENO, STDIN_FILENO);
		558	dup2 (STDERR_FILENO, STDOUT_FILENO);
		559
504	if (!ev_default_loop (0))	560	if (!ev_default_loop ())
505	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	561	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506		562
507	rxvt_environ = environ;	563	rxvt_environ = environ;
508		564
509	signal (SIGHUP, SIG_IGN);	565	signal (SIGHUP, SIG_IGN);
510	signal (SIGPIPE, SIG_IGN);	566	signal (SIGPIPE, SIG_IGN);
511		567
512	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	568	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513	sig_handlers.sw_int.start (SIGINT); ev_unref ();	569	sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
516	/* signal (SIGURG, SIG_DFL); */
517		570
518	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	571	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519	// TODO: handle this with exceptions and tolerate the memory loss	572	// TODO: handle this with exceptions and tolerate the memory loss
520	XSetIOErrorHandler (rxvt_xioerror_handler);	573	XSetIOErrorHandler (rxvt_xioerror_handler);
521		574
…		…
529	*/	582	*/
530	void	583	void
531	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	584	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532	{	585	{
533	short recalc_x, recalc_y;	586	short recalc_x, recalc_y;
534	int x, y, sb_w, flags;	587	int x, y, flags;
535	unsigned int w, h;	588	unsigned int w, h;
536	unsigned int max_width, max_height;	589	unsigned int max_width, max_height;
537		590
538	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	591	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
539	szHint.win_gravity = NorthWestGravity;	592	szHint.win_gravity = NorthWestGravity;
…		…
549	if (rs[Rs_geometry])	602	if (rs[Rs_geometry])
550	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	603	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551		604
552	if (flags & WidthValue)	605	if (flags & WidthValue)
553	{	606	{
		607	if (!w)
		608	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		609
554	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	610	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555	szHint.flags \|= USSize;	611	szHint.flags \|= USSize;
556	}	612	}
557		613
558	if (flags & HeightValue)	614	if (flags & HeightValue)
559	{	615	{
		616	if (!h)
		617	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		618
560	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	619	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561	szHint.flags \|= USSize;	620	szHint.flags \|= USSize;
562	}	621	}
563		622
564	if (flags & XValue)	623	if (flags & XValue)
565	{	624	{
…		…
596	max_width = MAX_COLS * fwidth;	655	max_width = MAX_COLS * fwidth;
597	max_height = MAX_ROWS * fheight;	656	max_height = MAX_ROWS * fheight;
598		657
599	szHint.base_width = szHint.base_height = 2 * int_bwidth;	658	szHint.base_width = szHint.base_height = 2 * int_bwidth;
600		659
601	sb_w = 0;
602	window_vt_x = window_vt_y = int_bwidth;	660	window_vt_x = window_vt_y = int_bwidth;
603		661
604	if (scrollBar.state)	662	if (scrollBar.state)
605	{	663	{
606	sb_w = scrollbar_TotalWidth ();	664	int sb_w = scrollBar.total_width ();
607	szHint.base_width += sb_w;	665	szHint.base_width += sb_w;
608		666
609	if (!option (Opt_scrollBar_right))	667	if (!option (Opt_scrollBar_right))
610	window_vt_x += sb_w;	668	window_vt_x += sb_w;
611	}	669	}
…		…
635	{	693	{
636	min_it (height, max_height);	694	min_it (height, max_height);
637	szHint.height = szHint.base_height + height;	695	szHint.height = szHint.base_height + height;
638	}	696	}
639		697
640	if (scrollBar.state && option (Opt_scrollBar_right))
641	window_sb_x = szHint.width - sb_w;
642
643	if (recalc_x)	698	if (recalc_x)
644	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	699	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645		700
646	if (recalc_y)	701	if (recalc_y)
647	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	702	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648		703
649	ncol = width / fwidth;	704	ncol = width / fwidth;
650	nrow = height / fheight;	705	nrow = height / fheight;
		706
		707	// When the size of the vt window is not a multiple of the cell
		708	// size, i.e., when the wm does not honour our size hints, there are
		709	// extra areas not covered by the terminal screen. Such gaps, when a
		710	// bg pixmap is set, would have to be cleared manually to properly
		711	// refresh the background. We take the simpler route and shrink the
		712	// vt window so as to avoid creating gaps.
		713	vt_width = ncol * fwidth;
		714	vt_height = nrow * fheight;
651	}	715	}
652		716
653	/----------------------------------------------------------------------/	717	/----------------------------------------------------------------------/
654	/*	718	/*
655	* Tell the teletype handler what size the window is.	719	* Tell the teletype handler what size the window is.
…		…
663		727
664	struct winsize ws;	728	struct winsize ws;
665		729
666	ws.ws_col = ncol;	730	ws.ws_col = ncol;
667	ws.ws_row = nrow;	731	ws.ws_row = nrow;
668	ws.ws_xpixel = width;	732	ws.ws_xpixel = vt_width;
669	ws.ws_ypixel = height;	733	ws.ws_ypixel = vt_height;
670	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	734	ioctl (pty->pty, TIOCSWINSZ, &ws);
671		735
672	#if 0	736	#if 0
673	// TIOCSWINSZ is supposed to do this automatically and correctly	737	// TIOCSWINSZ is supposed to do this automatically and correctly
674	if (cmd_pid) /* force through to the command */	738	if (cmd_pid) /* force through to the command */
675	kill (-cmd_pid, SIGWINCH);	739	kill (-cmd_pid, SIGWINCH);
676	#endif	740	#endif
677	}	741	}
678		742
679	/----------------------------------------------------------------------/	743	/----------------------------------------------------------------------/
680	/* set_fonts () - load and set the various fonts	744	/* load and set the various fonts */
681	*
682	* init = 1 - initialize
683	*
684	* fontname == FONT_UP - switch to bigger font
685	* fontname == FONT_DN - switch to smaller font
686	*/
687	bool	745	bool
688	rxvt_term::set_fonts ()	746	rxvt_term::set_fonts ()
689	{	747	{
690	rxvt_fontset *fs = new rxvt_fontset (this);	748	rxvt_fontset *fs = new rxvt_fontset (this);
691	rxvt_fontprop prop;	749	rxvt_fontprop prop;
…		…
705	#endif	763	#endif
706		764
707	delete fontset[0];	765	delete fontset[0];
708	fontset[0] = fs;	766	fontset[0] = fs;
709		767
710	prop = (*fs)[1]->properties ();	768	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711	prop.height += lineSpace;	769	prop.height += lineSpace;
		770	prop.width += letterSpace;
712		771
713	fs->set_prop (prop, false);	772	fs->set_prop (prop, false);
714		773
715	fwidth = prop.width;	774	fwidth = prop.width;
716	fheight = prop.height;	775	fheight = prop.height;
…		…
747	#else	806	#else
748	fontset[style] = fontset[0];	807	fontset[style] = fontset[0];
749	#endif	808	#endif
750	}	809	}
751		810
752	if (parent[0])	811	if (parent)
753	{	812	{
754	resize_all_windows (0, 0, 0);	813	resize_all_windows (0, 0, 0);
755	scr_remap_chars ();	814	scr_remap_chars ();
756	scr_touch (true);	815	scr_touch (true);
757	}	816	}
…		…
760	}	819	}
761		820
762	void	821	void
763	rxvt_term::set_string_property (Atom prop, const char *str, int len)	822	rxvt_term::set_string_property (Atom prop, const char *str, int len)
764	{	823	{
765	XChangeProperty (dpy, parent[0],	824	XChangeProperty (dpy, parent,
766	prop, XA_STRING, 8, PropModeReplace,	825	prop, XA_STRING, 8, PropModeReplace,
767	(const unsigned char *)str, len >= 0 ? len : strlen (str));	826	(const unsigned char *)str, len >= 0 ? len : strlen (str));
768	}	827	}
769		828
770	void	829	void
		830	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		831	{
		832	XTextProperty ct;
		833
		834	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		835	{
		836	XSetTextProperty (dpy, parent, &ct, prop);
		837	XFree (ct.value);
		838	}
		839	}
		840
		841	void
771	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	842	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772	{	843	{
773	wchar_t *ws = rxvt_mbstowcs (str, len);	844	wchar_t *ws = rxvt_mbstowcs (str, len);
774	char *s = rxvt_wcstoutf8 (ws);	845	char *s = rxvt_wcstoutf8 (ws);
775		846
776	XChangeProperty (dpy, parent[0],	847	XChangeProperty (dpy, parent,
777	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	848	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778	(const unsigned char *)s, strlen (s));	849	(const unsigned char *)s, strlen (s));
779		850
780	free (s);	851	free (s);
781	free (ws);	852	free (ws);
…		…
785	/----------------------------------------------------------------------/	856	/----------------------------------------------------------------------/
786	/* xterm sequences - title, iconName, color (exptl) */	857	/* xterm sequences - title, iconName, color (exptl) */
787	void	858	void
788	rxvt_term::set_title (const char *str)	859	rxvt_term::set_title (const char *str)
789	{	860	{
790	set_string_property (XA_WM_NAME, str);	861	set_mbstring_property (XA_WM_NAME, str);
791	#if ENABLE_EWMH	862	#if ENABLE_EWMH
792	set_utf8_property (xa[XA_NET_WM_NAME], str);	863	set_utf8_property (xa[XA_NET_WM_NAME], str);
793	#endif	864	#endif
794	}	865	}
795		866
796	void	867	void
797	rxvt_term::set_icon_name (const char *str)	868	rxvt_term::set_icon_name (const char *str)
798	{	869	{
799	set_string_property (XA_WM_ICON_NAME, str);	870	set_mbstring_property (XA_WM_ICON_NAME, str);
800	#if ENABLE_EWMH	871	#if ENABLE_EWMH
801	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	872	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802	#endif	873	#endif
803	}	874	}
804		875
805	void	876	void
806	rxvt_term::set_window_color (int idx, const char *color)	877	rxvt_term::set_window_color (int idx, const char *color)
807	{	878	{
808	#ifdef XTERM_COLOR_CHANGE	879	#ifdef XTERM_COLOR_CHANGE
809	rxvt_color xcol;	880	rxvt_color xcol;
810	int i;
811		881
812	if (color == NULL \|\| *color == '\0')	882	if (color == NULL \|\| *color == '\0')
813	return;	883	return;
814		884
815	color = strdup (color);	885	color = strdup (color);
…		…
817	rs[Rs_color + idx] = color;	887	rs[Rs_color + idx] = color;
818		888
819	/* handle color aliases */	889	/* handle color aliases */
820	if (isdigit (*color))	890	if (isdigit (*color))
821	{	891	{
822	i = atoi (color);	892	int i = atoi (color);
823		893
824	if (i >= 8 && i <= 15)	894	if (i >= 8 && i <= 15)
825	{	895	{
826	/* bright colors */	896	/* bright colors */
827	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	897	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
872		942
873	/----------------------------------------------------------------------/	943	/----------------------------------------------------------------------/
874	/*	944	/*
875	* find if fg/bg matches any of the normal (low-intensity) colors	945	* find if fg/bg matches any of the normal (low-intensity) colors
876	*/	946	*/
877	void	947	char *
878	rxvt_term::set_colorfgbg ()	948	rxvt_term::get_colorfgbg ()
879	{	949	{
880	unsigned int i;	950	unsigned int i;
881	const char *xpmb = "";	951	const char *xpmb = "";
882	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	952	char fstr[] = "default";
		953	char bstr[] = "default";
		954	char *env_colorfgbg;
883		955
884	strcpy (fstr, "default");
885	strcpy (bstr, "default");
886	for (i = Color_Black; i <= Color_White; i++)	956	for (i = Color_Black; i <= Color_White; i++)
887	if (pix_colors[Color_fg] == pix_colors[i])	957	if (pix_colors[Color_fg] == pix_colors[i])
888	{	958	{
889	sprintf (fstr, "%d", (i - Color_Black));	959	sprintf (fstr, "%d", i - Color_Black);
890	break;	960	break;
891	}	961	}
892		962
893	for (i = Color_Black; i <= Color_White; i++)	963	for (i = Color_Black; i <= Color_White; i++)
894	if (pix_colors[Color_bg] == pix_colors[i])	964	if (pix_colors[Color_bg] == pix_colors[i])
895	{	965	{
896	sprintf (bstr, "%d", (i - Color_Black));	966	sprintf (bstr, "%d", i - Color_Black);
897	#ifdef BG_IMAGE_FROM_FILE	967	#ifdef BG_IMAGE_FROM_FILE
898	xpmb = "default;";	968	xpmb = "default;";
899	#endif	969	#endif
900	break;	970	break;
901	}	971	}
902		972
		973	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
903	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	974	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		975	return env_colorfgbg;
904	}	976	}
905		977
906	/----------------------------------------------------------------------/	978	/----------------------------------------------------------------------/
907		979
908	bool	980	bool
…		…
931	int old_width = szHint.width;	1003	int old_width = szHint.width;
932	int old_height = szHint.height;	1004	int old_height = szHint.height;
933		1005
934	window_calc (newwidth, newheight);	1006	window_calc (newwidth, newheight);
935		1007
936	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1008	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1009
		1010	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1011	if (set_hint)
		1012	{
		1013	szHint.flags &= ~(PBaseSize \| PResizeInc);
937	XSetWMNormalHints (dpy, parent[0], &szHint);	1014	XSetWMNormalHints (dpy, parent, &szHint);
		1015	szHint.flags \|= PBaseSize \| PResizeInc;
		1016	}
938		1017
939	if (!ignoreparent)	1018	if (!ignoreparent)
940	{	1019	{
941	#ifdef SMART_RESIZE	1020	#ifdef SMART_RESIZE
942	/*	1021	/*
…		…
946	int x, y, x1, y1;	1025	int x, y, x1, y1;
947	int dx, dy;	1026	int dx, dy;
948	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1027	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
949	Window unused_cr;	1028	Window unused_cr;
950		1029
951	XTranslateCoordinates (dpy, parent[0], display->root,	1030	XTranslateCoordinates (dpy, parent, display->root,
952	0, 0, &x, &y, &unused_cr);	1031	0, 0, &x, &y, &unused_cr);
953	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1032	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
954	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1033	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
955	/*	1034	/*
956	* if display->root isn't the parent window, a WM will probably have offset	1035	* if display->root isn't the parent window, a WM will probably have offset
957	* our position for handles and decorations. Counter it	1036	* our position for handles and decorations. Counter it
958	*/	1037	*/
…		…
975	if (y < y1) /* top half */	1054	if (y < y1) /* top half */
976	dy = 0;	1055	dy = 0;
977	else if (y == y1) /* exact center */	1056	else if (y == y1) /* exact center */
978	dy /= 2;	1057	dy /= 2;
979		1058
980	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1059	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
981	szHint.width, szHint.height);	1060	szHint.width, szHint.height);
982	#else	1061	#else
983	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1062	XResizeWindow (dpy, parent, szHint.width, szHint.height);
984	#endif	1063	#endif
985	}	1064	}
		1065
		1066	if (set_hint)
		1067	XSetWMNormalHints (dpy, parent, &szHint);
986		1068
987	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1069	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
988		1070
989	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1071	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
990	{	1072	{
991	if (scrollBar.state)	1073	if (scrollBar.state)
992	{	1074	scrollBar.resize ();
993	XMoveResizeWindow (dpy, scrollBar.win,
994	window_sb_x, 0,
995	scrollbar_TotalWidth (), szHint.height);
996	resize_scrollbar ();
997	}
998		1075
999	XMoveResizeWindow (dpy, vt,	1076	XMoveResizeWindow (dpy, vt,
1000	window_vt_x, window_vt_y,	1077	window_vt_x, window_vt_y,
1001	width, height);	1078	vt_width, vt_height);
1002		1079
1003	#ifdef HAVE_BG_PIXMAP	1080	#ifdef HAVE_BG_PIXMAP
1004	if (bgPixmap.window_size_sensitive ())	1081	if (bg_window_size_sensitive ())
1005	update_background ();	1082	update_background ();
1006	#endif	1083	#endif
1007
1008	scr_clear ();
1009	}	1084	}
1010		1085
1011	if (fix_screen \|\| old_height == 0)	1086	if (fix_screen \|\| old_height == 0)
1012	scr_reset ();	1087	scr_reset ();
1013		1088
1014	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1015	//scr_touch (false);
1016
1017	#ifdef HAVE_BG_PIXMAP
1018	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019	// if (bgPixmap.pixmap)
1020	// scr_touch (false);
1021	#endif
1022
1023	#ifdef USE_XIM	1089	#ifdef USE_XIM
1024	IMSetPosition ();	1090	im_set_position ();
1025	#endif	1091	#endif
1026	}	1092	}
1027		1093
1028	/*	1094	/*
1029	* Set the width/height of the vt window in characters. Units are pixels.	1095	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1042	newwidth = wattr.width - szHint.base_width;	1108	newwidth = wattr.width - szHint.base_width;
1043	if (newheight == 0)	1109	if (newheight == 0)
1044	newheight = wattr.height - szHint.base_height;	1110	newheight = wattr.height - szHint.base_height;
1045	}	1111	}
1046		1112
1047	if (newwidth != width \|\| newheight != height)	1113	if (newwidth != vt_width \|\| newheight != vt_height)
1048	{	1114	{
1049	newwidth += szHint.base_width;	1115	newwidth += szHint.base_width;
1050	newheight += szHint.base_height;	1116	newheight += szHint.base_height;
1051	resize_all_windows (newwidth, newheight, 0);	1117	resize_all_windows (newwidth, newheight, 0);
1052	}	1118	}
…		…
1090	status_rect.height = fheight;	1156	status_rect.height = fheight;
1091	}	1157	}
1092		1158
1093	/* Checking whether input method is running. */	1159	/* Checking whether input method is running. */
1094	bool	1160	bool
1095	rxvt_term::IMisRunning ()	1161	rxvt_term::im_is_running ()
1096	{	1162	{
1097	char *p;
1098	Atom atom;	1163	Atom atom;
1099	Window win;	1164	Window win;
1100	char server[IMBUFSIZ];	1165	char server[IMBUFSIZ];
1101		1166
1102	/* get current locale modifier */	1167	/* get current locale modifier */
1103	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1168	if (char *p = XSetLocaleModifiers (0))
1104	{	1169	{
1105	strcpy (server, "@server=");	1170	strcpy (server, "@server=");
1106	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1171	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107		1172
1108	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1173	if (p = strchr (server + 1, '@')) /* first one only */
1109	*p = '\0';	1174	*p = '\0';
1110		1175
1111	atom = XInternAtom (dpy, server, False);	1176	atom = XInternAtom (dpy, server, False);
1112	win = XGetSelectionOwner (dpy, atom);	1177	win = XGetSelectionOwner (dpy, atom);
1113		1178
1114	if (win != None)	1179	if (win != None)
1115	return True;	1180	return true;
1116	}	1181	}
1117		1182
1118	return False;	1183	return false;
1119	}	1184	}
1120		1185
1121	void	1186	void
1122	rxvt_term::IMSendSpot ()	1187	rxvt_term::im_send_spot ()
1123	{	1188	{
1124	XPoint nspot;	1189	XPoint nspot;
1125	XVaNestedList preedit_attr;	1190	XVaNestedList preedit_attr;
1126		1191
1127	if (!Input_Context	1192	if (!Input_Context
…		…
1180		1245
1181	term->make_current ();	1246	term->make_current ();
1182		1247
1183	if (text)	1248	if (text)
1184	{	1249	{
1185	void *str;	1250	wchar_t *str;
1186		1251
1187	if (!text->encoding_is_wchar && text->string.multi_byte)	1252	if (!text->encoding_is_wchar && text->string.multi_byte)
1188	{	1253	{
1189	// of course, X makes it ugly again	1254	// of course, X makes it ugly again
1190	if (term->rs[Rs_imLocale])	1255	if (term->rs[Rs_imLocale])
1191	SET_LOCALE (term->rs[Rs_imLocale]);	1256	SET_LOCALE (term->rs[Rs_imLocale]);
1192		1257
1193	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1258	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1259	mbstowcs (str, text->string.multi_byte, text->length + 1);
1195		1260
1196	if (term->rs[Rs_imLocale])	1261	if (term->rs[Rs_imLocale])
1197	SET_LOCALE (term->locale);	1262	SET_LOCALE (term->locale);
1198	}	1263	}
1199	else	1264	else
1200	str = (void *)text->string.wide_char;	1265	str = text->string.wide_char;
1201		1266
1202	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1267	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203	DT_INT, call_data->caret,	1268	DT_INT, call_data->caret,
1204	DT_INT, call_data->chg_first,	1269	DT_INT, call_data->chg_first,
1205	DT_INT, call_data->chg_length,	1270	DT_INT, call_data->chg_length,
…		…
1233	/*	1298	/*
1234	* Try to open a XIM with the current modifiers, then see if we can	1299	* Try to open a XIM with the current modifiers, then see if we can
1235	* open a suitable preedit type	1300	* open a suitable preedit type
1236	*/	1301	*/
1237	bool	1302	bool
1238	rxvt_term::IM_get_IC (const char *modifiers)	1303	rxvt_term::im_get_ic (const char *modifiers)
1239	{	1304	{
1240	int i, j, found;	1305	int i, j, found;
1241	XIM xim;	1306	XIM xim;
1242	XPoint spot;	1307	XPoint spot;
1243	XRectangle rect, status_rect, needed_rect;	1308	XRectangle rect, status_rect, needed_rect;
1244	unsigned long fg, bg;	1309	unsigned long fg, bg;
1245	const char *p;	1310	const char *p;
1246	char **s;	1311	char **s;
1247	XIMStyles *xim_styles;	1312	XIMStyles *xim_styles;
1248	#ifdef ENABLE_XIM_ONTHESPOT
1249	XIMCallback xcb[4];
1250	#endif
1251		1313
1252	set_environ (envv);	1314	set_environ (envv);
1253		1315
1254	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1316	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1255	return false;	1317	return false;
…		…
1276	p = pet[pi];	1338	p = pet[pi];
1277		1339
1278	if (!p)	1340	if (!p)
1279	continue;	1341	continue;
1280		1342
1281	s = rxvt_splitcommastring (p);	1343	s = rxvt_strsplit (',', p);
1282		1344
1283	for (i = found = 0; !found && s[i]; i++)	1345	for (i = found = 0; !found && s[i]; i++)
1284	{	1346	{
1285	if (!strcmp (s[i], "OverTheSpot"))	1347	if (!strcmp (s[i], "OverTheSpot"))
1286	input_style = XIMPreeditPosition \| XIMStatusNothing;	1348	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1298	input_style = XIMPreeditNothing \| XIMStatusNothing;	1360	input_style = XIMPreeditNothing \| XIMStatusNothing;
1299		1361
1300	for (j = 0; j < xim_styles->count_styles; j++)	1362	for (j = 0; j < xim_styles->count_styles; j++)
1301	if (input_style == xim_styles->supported_styles[j])	1363	if (input_style == xim_styles->supported_styles[j])
1302	{	1364	{
1303	rxvt_freecommastring (s);	1365	rxvt_free_strsplit (s);
1304		1366
1305	found = 1;	1367	found = 1;
1306	goto foundpet;	1368	goto foundpet;
1307	}	1369	}
1308		1370
1309	}	1371	}
1310		1372
1311	rxvt_freecommastring (s);	1373	rxvt_free_strsplit (s);
1312	}	1374	}
1313		1375
1314	foundpet:	1376	foundpet:
1315		1377
1316	XFree (xim_styles);	1378	XFree (xim_styles);
…		…
1395	NULL);	1457	NULL);
1396	}	1458	}
1397	#if ENABLE_XIM_ONTHESPOT	1459	#if ENABLE_XIM_ONTHESPOT
1398	else if (input_style & XIMPreeditCallbacks)	1460	else if (input_style & XIMPreeditCallbacks)
1399	{	1461	{
		1462	XIMCallback xcb[4];
		1463
1400	im_set_position (spot);	1464	im_set_position (spot);
1401		1465
1402	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1466	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1403	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1467	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1404	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1468	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1419	#endif	1483	#endif
1420		1484
1421	Input_Context = XCreateIC (xim,	1485	Input_Context = XCreateIC (xim,
1422	XNInputStyle, input_style,	1486	XNInputStyle, input_style,
1423	XNClientWindow, vt,	1487	XNClientWindow, vt,
1424	XNFocusWindow, parent[0],	1488	XNFocusWindow, parent,
1425	preedit_attr ? XNPreeditAttributes : NULL,	1489	preedit_attr ? XNPreeditAttributes : NULL,
1426	preedit_attr,	1490	preedit_attr,
1427	status_attr ? XNStatusAttributes : NULL,	1491	status_attr ? XNStatusAttributes : NULL,
1428	status_attr, NULL);	1492	status_attr, NULL);
1429		1493
…		…
1442	// unfortunately, only the focus window is used by XIM, hard to fix	1506	// unfortunately, only the focus window is used by XIM, hard to fix
1443	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1507	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1444	vt_select_input ();	1508	vt_select_input ();
1445	#endif	1509	#endif
1446		1510
1447	IMSetPosition ();	1511	im_set_position ();
1448		1512
1449	return true;	1513	return true;
1450	}	1514	}
1451		1515
1452	void	1516	void
…		…
1462	im_destroy ();	1526	im_destroy ();
1463		1527
1464	if (Input_Context)	1528	if (Input_Context)
1465	return;	1529	return;
1466		1530
1467	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1468	if (rs[Rs_imLocale])	1531	if (rs[Rs_imLocale])
1469	SET_LOCALE (rs[Rs_imLocale]);	1532	SET_LOCALE (rs[Rs_imLocale]);
1470	#endif
1471		1533
1472	p = rs[Rs_inputMethod];	1534	p = rs[Rs_inputMethod];
1473	if (p && *p)	1535	if (p && *p)
1474	{	1536	{
1475	bool found = false;	1537	bool found = false;
1476		1538
1477	s = rxvt_splitcommastring (p);	1539	s = rxvt_strsplit (',', p);
1478		1540
1479	for (i = 0; s[i]; i++)	1541	for (i = 0; s[i]; i++)
1480	{	1542	{
1481	if (*s[i])	1543	if (*s[i])
1482	{	1544	{
1483	strcpy (buf, "@im=");	1545	strcpy (buf, "@im=");
1484	strncat (buf, s[i], IMBUFSIZ - 5);	1546	strncat (buf, s[i], IMBUFSIZ - 5);
1485	if (IM_get_IC (buf))	1547	if (im_get_ic (buf))
1486	{	1548	{
1487	found = true;	1549	found = true;
1488	break;	1550	break;
1489	}	1551	}
1490	}	1552	}
1491	}	1553	}
1492		1554
1493	rxvt_freecommastring (s);	1555	rxvt_free_strsplit (s);
1494		1556
1495	if (found)	1557	if (found)
1496	goto done;	1558	goto done;
1497	}	1559	}
1498		1560
1499	/* try with XMODIFIERS env. var. */	1561	/* try with XMODIFIERS env. var. */
1500	if (IM_get_IC (""))	1562	if (im_get_ic (""))
1501	goto done;	1563	goto done;
1502		1564
1503	/* try with no modifiers base IF the user didn't specify an IM */	1565	/* try with no modifiers base IF the user didn't specify an IM */
1504	if (IM_get_IC ("@im=none"))	1566	if (im_get_ic ("@im=none"))
1505	goto done;	1567	goto done;
1506		1568
1507	done:	1569	done: ;
1508	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1509	if (rs[Rs_imLocale])	1570	if (rs[Rs_imLocale])
1510	SET_LOCALE (locale);	1571	SET_LOCALE (locale);
1511	#endif
1512	}	1572	}
1513		1573
1514	void	1574	void
1515	rxvt_term::IMSetPosition ()	1575	rxvt_term::im_set_position ()
1516	{	1576	{
1517	XRectangle preedit_rect, status_rect, *needed_rect;	1577	XRectangle preedit_rect, status_rect, *needed_rect;
1518	XVaNestedList preedit_attr, status_attr;	1578	XVaNestedList preedit_attr, status_attr;
1519		1579
1520	if (!Input_Context	1580	if (!Input_Context
1521	\|\| !focus	1581	\|\| !focus
1522	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1582	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1523	\|\| !IMisRunning ())	1583	\|\| !im_is_running ())
1524	return;	1584	return;
1525		1585
1526	if (input_style & XIMPreeditPosition)	1586	if (input_style & XIMPreeditPosition)
1527	{	1587	{
1528	im_set_size (preedit_rect);	1588	im_set_size (preedit_rect);
…		…
1558		1618
1559	void	1619	void
1560	rxvt_term::get_window_origin (int &x, int &y)	1620	rxvt_term::get_window_origin (int &x, int &y)
1561	{	1621	{
1562	Window cr;	1622	Window cr;
1563	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1623	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1564	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565	}	1624	}
1566		1625
1567	Pixmap	1626	Pixmap
1568	rxvt_term::get_pixmap_property (int prop_id)	1627	rxvt_term::get_pixmap_property (Atom property)
1569	{	1628	{
1570	if (prop_id > 0 && prop_id < NUM_XA)	1629	Pixmap pixmap = None;
1571	if (xa[prop_id])	1630
1572	{
1573	int aformat;	1631	int aformat;
1574	unsigned long nitems, bytes_after;	1632	unsigned long nitems, bytes_after;
1575	Atom atype;	1633	Atom atype;
1576	unsigned char *prop = NULL;	1634	unsigned char *prop;
1577	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1635	int result = XGetWindowProperty (dpy, display->root, property,
1578	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1636	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579	&nitems, &bytes_after, &prop);	1637	&nitems, &bytes_after, &prop);
1580	if (result == Success && prop && atype == XA_PIXMAP)	1638	if (result == Success)
		1639	{
		1640	if (atype == XA_PIXMAP)
1581	return (Pixmap )prop;	1641	pixmap = (Pixmap )prop;
		1642	XFree (prop);
1582	}	1643	}
1583		1644
1584	return None;	1645	return pixmap;
1585	}	1646	}
1586		1647
1587	#ifdef HAVE_BG_PIXMAP	1648	#ifdef HAVE_BG_PIXMAP
1588	# if TRACE_PIXMAPS
1589	# undef update_background
1590	void
1591	rxvt_term::trace_update_background (const char *file, int line)
1592	{
1593	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594	update_background ();
1595	}
1596	# endif
1597		1649
1598	void	1650	void
1599	rxvt_term::update_background ()	1651	rxvt_term::update_background ()
1600	{	1652	{
1601	if (update_background_ev.is_active ())	1653	if (update_background_ev.is_active ())
1602	return;	1654	return;
1603		1655
1604	bgPixmap.invalidate ();	1656	bg_invalidate ();
1605		1657
		1658	if (!mapped)
		1659	return;
		1660
1606	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1661	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1607		1662
1608	if (to_wait <= 0.)	1663	if (to_wait <= 0.)
1609	bgPixmap.render ();	1664	bg_render ();
1610	else	1665	else
1611	update_background_ev.start (to_wait);	1666	update_background_ev.start (to_wait);
1612	}	1667	}
1613		1668
1614	void	1669	void
1615	rxvt_term::update_background_cb (ev::timer &w, int revents)	1670	rxvt_term::update_background_cb (ev::timer &w, int revents)
1616	{	1671	{
1617	make_current ();	1672	make_current ();
1618		1673
1619	update_background_ev.stop ();	1674	update_background_ev.stop ();
1620	bgPixmap.render ();	1675	bg_render ();
1621	refresh_check ();	1676	refresh_check ();
1622	}	1677	}
1623		1678
1624	#endif /* HAVE_BG_PIXMAP */	1679	#endif /* HAVE_BG_PIXMAP */
1625		1680

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.301 by ayin, Sat Jan 19 13:00:10 2008 UTC vs. Revision 1.370 by sf-exg, Thu Jan 19 15:08:55 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.301 by ayin, Sat Jan 19 13:00:10 2008 UTC vs.
Revision 1.370 by sf-exg, Thu Jan 19 15:08:55 2012 UTC