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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs.
Revision 1.346 by sf-exg, Sat Jan 8 10:37:21 2011 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-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 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.
…		…
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 <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94	{	97	{
95	compose_char *cc;	98	compose_char *cc;
96		99
97	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	102	cc = (*this)[c1];
100	while (cc)	103	while (cc)
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
111	}
112		113
113	// allocate a new combination	114	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	116	{
116	static int seen;	117	static int seen;
117		118
118	if (!seen++)	119	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		121
121	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
122	}	123	}
123		124
124	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
227	delete fontset[0];	228	delete fontset[0];
228		229
229	#ifdef HAVE_BG_PIXMAP	230	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	231	bgPixmap.destroy ();
231	#endif	232	#endif
		233	#ifdef HAVE_AFTERIMAGE
		234	if (asv)
		235	destroy_asvisual (asv, 0);
		236	if (asimman)
		237	destroy_image_manager (asimman, 0);
		238	#endif
232		239
233	if (display)	240	if (display)
234	{	241	{
235	selection_clear ();	242	selection_clear ();
		243	selection_clear (true);
236		244
237	#ifdef USE_XIM	245	#ifdef USE_XIM
238	im_destroy ();	246	im_destroy ();
239	#endif	247	#endif
240	#ifdef XTERM_SCROLLBAR	248	scrollBar.destroy ();
241	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242	if (ShadowGC) XFreeGC (dpy, ShadowGC);
243	#endif
244	#ifdef PLAIN_SCROLLBAR
245	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246	#endif
247	#ifdef NEXT_SCROLLBAR
248	if (blackGC) XFreeGC (dpy, blackGC);
249	if (whiteGC) XFreeGC (dpy, whiteGC);
250	if (grayGC) XFreeGC (dpy, grayGC);
251	if (darkGC) XFreeGC (dpy, darkGC);
252	if (stippleGC) XFreeGC (dpy, stippleGC);
253	if (dimple) XFreePixmap (dpy, dimple);
254	if (upArrow) XFreePixmap (dpy, upArrow);
255	if (downArrow) XFreePixmap (dpy, downArrow);
256	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258	#endif
259	#ifdef RXVT_SCROLLBAR
260	if (topShadowGC) XFreeGC (dpy, topShadowGC);
261	if (botShadowGC) XFreeGC (dpy, botShadowGC);
262	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263	#endif
264	if (gc) XFreeGC (dpy, gc);	249	if (gc) XFreeGC (dpy, gc);
265		250
266	delete drawable;	251	delete drawable;
267	// destroy all windows	252	// destroy all windows
268	if (parent[0])	253	if (parent[0])
…		…
288	/* clear all resources */	273	/* clear all resources */
289	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
290	free (allocated [i]);	275	free (allocated [i]);
291		276
292	free (selection.text);	277	free (selection.text);
		278	free (selection.clip_text);
293	// TODO: manage env vars in child only(!)	279	// TODO: manage env vars in child only(!)
294	free (env_display);	280	free (env_display);
295	free (env_term);	281	free (env_term);
296	free (locale);	282	free (locale);
297	free (v_buffer);	283	free (v_buffer);
…		…
373	make_current ();	359	make_current ();
374		360
375	delete this;	361	delete this;
376	}	362	}
377		363
		364	void
		365	rxvt_term::set_option (uint8_t opt, bool set)
		366	{
		367	if (!opt)
		368	return;
		369
		370	uint8_t mask = 1 << (opt & 7);
		371	uint8_t &val = options [opt >> 3];
		372
		373	val = val & ~mask \| (set ? mask : 0);
		374	}
		375
378	/----------------------------------------------------------------------/	376	/----------------------------------------------------------------------/
379	/*	377	/*
380	* Exit gracefully, clearing the utmp entry and restoring tty attributes	378	* Exit gracefully, clearing the utmp entry and restoring tty attributes
381	* TODO: if debugging, this should free up any known resources if we can	379	* TODO: if debugging, this should free up any known resources if we can
382	*/	380	*/
…		…
394	print_x_error (Display dpy, XErrorEvent event)	392	print_x_error (Display dpy, XErrorEvent event)
395	{	393	{
396	char buffer[BUFSIZ];	394	char buffer[BUFSIZ];
397	char mesg[BUFSIZ];	395	char mesg[BUFSIZ];
398	char number[32];	396	char number[32];
399	char *mtype = "XlibMessage";	397	const char mtype[] = "XlibMessage";
400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	398	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	399	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402	rxvt_warn ("An X Error occured, trying to continue after report.\n");	400	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403	rxvt_warn ("%s: %s\n", mesg, buffer);	401	rxvt_warn ("%s: %s\n", mesg, buffer);
404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	402	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406	sprintf(number, "%d", event->request_code);	404	sprintf(number, "%d", event->request_code);
407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	405	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408	rxvt_warn ("(which is %s)\n", buffer);	406	rxvt_warn ("(which is %s)\n", buffer);
409	if (event->request_code >= 128) {	407	if (event->request_code >= 128) {
410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	408	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411	mesg, BUFSIZ);	409	mesg, BUFSIZ);
412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413	}	411	}
414	if ((event->error_code == BadWindow) \|\|	412	if ((event->error_code == BadWindow) \|\|
415	(event->error_code == BadPixmap) \|\|	413	(event->error_code == BadPixmap) \|\|
416	(event->error_code == BadCursor) \|\|	414	(event->error_code == BadCursor) \|\|
417	(event->error_code == BadFont) \|\|	415	(event->error_code == BadFont) \|\|
418	(event->error_code == BadDrawable) \|\|	416	(event->error_code == BadDrawable) \|\|
419	(event->error_code == BadColor) \|\|	417	(event->error_code == BadColor) \|\|
420	(event->error_code == BadGC) \|\|	418	(event->error_code == BadGC) \|\|
421	(event->error_code == BadIDChoice) \|\|	419	(event->error_code == BadIDChoice) \|\|
422	(event->error_code == BadValue) \|\|	420	(event->error_code == BadValue) \|\|
423	(event->error_code == BadAtom)) {	421	(event->error_code == BadAtom)) {
424	if (event->error_code == BadValue)	422	if (event->error_code == BadValue)
425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	423	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426	mesg, BUFSIZ);	424	mesg, BUFSIZ);
427	else if (event->error_code == BadAtom)	425	else if (event->error_code == BadAtom)
428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	426	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429	mesg, BUFSIZ);	427	mesg, BUFSIZ);
430	else	428	else
431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432	mesg, BUFSIZ);	430	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434	}	432	}
435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436	mesg, BUFSIZ);	434	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438	}	436	}
439	#endif	437	#endif
440		438
441	int	439	int
…		…
488	rxvt_emergency_cleanup ();	486	rxvt_emergency_cleanup ();
489	w.stop ();	487	w.stop ();
490	kill (getpid (), w.signum);	488	kill (getpid (), w.signum);
491	}	489	}
492		490
		491	static void
		492	rxvt_get_ttymode (struct termios *tio)
		493	{
		494	if (tcgetattr (STDIN_FILENO, tio) < 0)
		495	memset (tio, 0, sizeof (struct termios));
		496
		497	for (int i = 0; i < NCCS; i++)
		498	tio->c_cc[i] = VDISABLE;
		499
		500	tio->c_cc[VINTR] = CINTR;
		501	tio->c_cc[VQUIT] = CQUIT;
		502	tio->c_cc[VERASE] = CERASE;
		503	#ifdef VERASE2
		504	tio->c_cc[VERASE2] = CERASE2;
		505	#endif
		506	tio->c_cc[VKILL] = CKILL;
		507	tio->c_cc[VEOF] = CEOF;
		508	tio->c_cc[VSTART] = CSTART;
		509	tio->c_cc[VSTOP] = CSTOP;
		510	tio->c_cc[VSUSP] = CSUSP;
		511	# ifdef VDSUSP
		512	tio->c_cc[VDSUSP] = CDSUSP;
		513	# endif
		514	# ifdef VREPRINT
		515	tio->c_cc[VREPRINT] = CRPRNT;
		516	# endif
		517	# ifdef VDISCRD
		518	tio->c_cc[VDISCRD] = CFLUSH;
		519	# endif
		520	# ifdef VWERSE
		521	tio->c_cc[VWERSE] = CWERASE;
		522	# endif
		523	# ifdef VLNEXT
		524	tio->c_cc[VLNEXT] = CLNEXT;
		525	# endif
		526	# ifdef VSTATUS
		527	tio->c_cc[VSTATUS] = CSTATUS;
		528	# endif
		529
		530	# if VMIN != VEOF
		531	tio->c_cc[VMIN] = 1;
		532	# endif
		533	# if VTIME != VEOL
		534	tio->c_cc[VTIME] = 0;
		535	# endif
		536
		537	/* input modes */
		538	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		539	# ifdef IMAXBEL
		540	\| IMAXBEL
		541	# endif
		542	\| IXON);
		543
		544	/* output modes */
		545	tio->c_oflag = (OPOST \| ONLCR);
		546
		547	/* control modes */
		548	tio->c_cflag = (CS8 \| CREAD);
		549
		550	/* local modes */
		551	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		552	# if defined (ECHOCTL) && defined (ECHOKE)
		553	\| ECHOCTL \| ECHOKE
		554	# endif
		555	\| ECHOE \| ECHOK);
		556	}
		557
493	char **rxvt_environ; // startup environment	558	char **rxvt_environ; // startup environment
494		559
495	void	560	void
496	rxvt_init ()	561	rxvt_init ()
497	{	562	{
498	ptytty::init ();	563	assert (("fontMask must not overlap other RS masks",
		564	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
499		565
		566	rxvt_get_ttymode (&rxvt_term::def_tio);
		567
		568	// get rid of stdin/stdout as we don't need them, to free resources
		569	dup2 (STDERR_FILENO, STDIN_FILENO);
		570	dup2 (STDERR_FILENO, STDOUT_FILENO);
		571
500	if (!ev_default_loop (0))	572	if (!ev_default_loop ())
501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	573	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502		574
503	rxvt_environ = environ;	575	rxvt_environ = environ;
504		576
505	signal (SIGHUP, SIG_IGN);	577	signal (SIGHUP, SIG_IGN);
506	signal (SIGPIPE, SIG_IGN);	578	signal (SIGPIPE, SIG_IGN);
507		579
508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	580	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509	sig_handlers.sw_int.start (SIGINT); ev_unref ();	581	sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
512	/* signal (SIGURG, SIG_DFL); */
513		582
514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	583	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515	// TODO: handle this with exceptions and tolerate the memory loss	584	// TODO: handle this with exceptions and tolerate the memory loss
516	XSetIOErrorHandler (rxvt_xioerror_handler);	585	XSetIOErrorHandler (rxvt_xioerror_handler);
517		586
…		…
525	*/	594	*/
526	void	595	void
527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	596	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528	{	597	{
529	short recalc_x, recalc_y;	598	short recalc_x, recalc_y;
530	int x, y, sb_w, flags;	599	int x, y, flags;
531	unsigned int w, h;	600	unsigned int w, h;
532	unsigned int max_width, max_height;	601	unsigned int max_width, max_height;
533		602
534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	603	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
535	szHint.win_gravity = NorthWestGravity;	604	szHint.win_gravity = NorthWestGravity;
…		…
545	if (rs[Rs_geometry])	614	if (rs[Rs_geometry])
546	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	615	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547		616
548	if (flags & WidthValue)	617	if (flags & WidthValue)
549	{	618	{
		619	if (!w)
		620	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		621
550	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	622	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551	szHint.flags \|= USSize;	623	szHint.flags \|= USSize;
552	}	624	}
553		625
554	if (flags & HeightValue)	626	if (flags & HeightValue)
555	{	627	{
		628	if (!h)
		629	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		630
556	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	631	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557	szHint.flags \|= USSize;	632	szHint.flags \|= USSize;
558	}	633	}
559		634
560	if (flags & XValue)	635	if (flags & XValue)
561	{	636	{
…		…
592	max_width = MAX_COLS * fwidth;	667	max_width = MAX_COLS * fwidth;
593	max_height = MAX_ROWS * fheight;	668	max_height = MAX_ROWS * fheight;
594		669
595	szHint.base_width = szHint.base_height = 2 * int_bwidth;	670	szHint.base_width = szHint.base_height = 2 * int_bwidth;
596		671
597	sb_w = 0;
598	window_vt_x = window_vt_y = int_bwidth;	672	window_vt_x = window_vt_y = int_bwidth;
599		673
600	if (scrollBar.state)	674	if (scrollBar.state)
601	{	675	{
602	sb_w = scrollBar.total_width ();	676	int sb_w = scrollBar.total_width ();
603	szHint.base_width += sb_w;	677	szHint.base_width += sb_w;
604		678
605	if (!option (Opt_scrollBar_right))	679	if (!option (Opt_scrollBar_right))
606	window_vt_x += sb_w;	680	window_vt_x += sb_w;
607	}	681	}
…		…
631	{	705	{
632	min_it (height, max_height);	706	min_it (height, max_height);
633	szHint.height = szHint.base_height + height;	707	szHint.height = szHint.base_height + height;
634	}	708	}
635		709
636	if (scrollBar.state && option (Opt_scrollBar_right))
637	window_sb_x = szHint.width - sb_w;
638
639	if (recalc_x)	710	if (recalc_x)
640	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	711	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641		712
642	if (recalc_y)	713	if (recalc_y)
643	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	714	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644		715
645	ncol = width / fwidth;	716	ncol = width / fwidth;
646	nrow = height / fheight;	717	nrow = height / fheight;
647	}	718	}
648		719
649	/----------------------------------------------------------------------/	720	/----------------------------------------------------------------------/
650	/*	721	/*
…		…
661		732
662	ws.ws_col = ncol;	733	ws.ws_col = ncol;
663	ws.ws_row = nrow;	734	ws.ws_row = nrow;
664	ws.ws_xpixel = width;	735	ws.ws_xpixel = width;
665	ws.ws_ypixel = height;	736	ws.ws_ypixel = height;
666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	737	ioctl (pty->pty, TIOCSWINSZ, &ws);
667		738
668	#if 0	739	#if 0
669	// TIOCSWINSZ is supposed to do this automatically and correctly	740	// TIOCSWINSZ is supposed to do this automatically and correctly
670	if (cmd_pid) /* force through to the command */	741	if (cmd_pid) /* force through to the command */
671	kill (-cmd_pid, SIGWINCH);	742	kill (-cmd_pid, SIGWINCH);
…		…
701	#endif	772	#endif
702		773
703	delete fontset[0];	774	delete fontset[0];
704	fontset[0] = fs;	775	fontset[0] = fs;
705		776
706	prop = (*fs)[1]->properties ();	777	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707	prop.height += lineSpace;	778	prop.height += lineSpace;
		779	prop.width += letterSpace;
708		780
709	fs->set_prop (prop, false);	781	fs->set_prop (prop, false);
710		782
711	fwidth = prop.width;	783	fwidth = prop.width;
712	fheight = prop.height;	784	fheight = prop.height;
…		…
762	prop, XA_STRING, 8, PropModeReplace,	834	prop, XA_STRING, 8, PropModeReplace,
763	(const unsigned char *)str, len >= 0 ? len : strlen (str));	835	(const unsigned char *)str, len >= 0 ? len : strlen (str));
764	}	836	}
765		837
766	void	838	void
		839	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		840	{
		841	XTextProperty ct;
		842
		843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		844	{
		845	XSetTextProperty (dpy, parent[0], &ct, prop);
		846	XFree (ct.value);
		847	}
		848	}
		849
		850	void
767	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
768	{	852	{
769	wchar_t *ws = rxvt_mbstowcs (str, len);	853	wchar_t *ws = rxvt_mbstowcs (str, len);
770	char *s = rxvt_wcstoutf8 (ws);	854	char *s = rxvt_wcstoutf8 (ws);
771		855
…		…
781	/----------------------------------------------------------------------/	865	/----------------------------------------------------------------------/
782	/* xterm sequences - title, iconName, color (exptl) */	866	/* xterm sequences - title, iconName, color (exptl) */
783	void	867	void
784	rxvt_term::set_title (const char *str)	868	rxvt_term::set_title (const char *str)
785	{	869	{
786	set_string_property (XA_WM_NAME, str);	870	set_mbstring_property (XA_WM_NAME, str);
787	#if ENABLE_EWMH	871	#if ENABLE_EWMH
788	set_utf8_property (xa[XA_NET_WM_NAME], str);	872	set_utf8_property (xa[XA_NET_WM_NAME], str);
789	#endif	873	#endif
790	}	874	}
791		875
792	void	876	void
793	rxvt_term::set_icon_name (const char *str)	877	rxvt_term::set_icon_name (const char *str)
794	{	878	{
795	set_string_property (XA_WM_ICON_NAME, str);	879	set_mbstring_property (XA_WM_ICON_NAME, str);
796	#if ENABLE_EWMH	880	#if ENABLE_EWMH
797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	881	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798	#endif	882	#endif
799	}	883	}
800		884
…		…
872	void	956	void
873	rxvt_term::set_colorfgbg ()	957	rxvt_term::set_colorfgbg ()
874	{	958	{
875	unsigned int i;	959	unsigned int i;
876	const char *xpmb = "";	960	const char *xpmb = "";
877	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	961	char fstr[] = "default";
		962	char bstr[] = "default";
878		963
879	strcpy (fstr, "default");
880	strcpy (bstr, "default");
881	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
882	if (pix_colors[Color_fg] == pix_colors[i])	965	if (pix_colors[Color_fg] == pix_colors[i])
883	{	966	{
884	sprintf (fstr, "%d", (i - Color_Black));	967	sprintf (fstr, "%d", i - Color_Black);
885	break;	968	break;
886	}	969	}
887		970
888	for (i = Color_Black; i <= Color_White; i++)	971	for (i = Color_Black; i <= Color_White; i++)
889	if (pix_colors[Color_bg] == pix_colors[i])	972	if (pix_colors[Color_bg] == pix_colors[i])
890	{	973	{
891	sprintf (bstr, "%d", (i - Color_Black));	974	sprintf (bstr, "%d", i - Color_Black);
892	#ifdef BG_IMAGE_FROM_FILE	975	#ifdef BG_IMAGE_FROM_FILE
893	xpmb = "default;";	976	xpmb = "default;";
894	#endif	977	#endif
895	break;	978	break;
896	}	979	}
…		…
926	int old_width = szHint.width;	1009	int old_width = szHint.width;
927	int old_height = szHint.height;	1010	int old_height = szHint.height;
928		1011
929	window_calc (newwidth, newheight);	1012	window_calc (newwidth, newheight);
930		1013
931	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1014	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1015
		1016	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1017	if (set_hint)
		1018	{
		1019	szHint.flags &= ~(PBaseSize \| PResizeInc);
932	XSetWMNormalHints (dpy, parent[0], &szHint);	1020	XSetWMNormalHints (dpy, parent[0], &szHint);
		1021	szHint.flags \|= PBaseSize \| PResizeInc;
		1022	}
933		1023
934	if (!ignoreparent)	1024	if (!ignoreparent)
935	{	1025	{
936	#ifdef SMART_RESIZE	1026	#ifdef SMART_RESIZE
937	/*	1027	/*
…		…
977	#else	1067	#else
978	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1068	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
979	#endif	1069	#endif
980	}	1070	}
981		1071
		1072	if (set_hint)
		1073	XSetWMNormalHints (dpy, parent[0], &szHint);
		1074
982	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1075	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
983		1076
984	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1077	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
985	{	1078	{
986	if (scrollBar.state)	1079	if (scrollBar.state)
987	{	1080	scrollBar.resize ();
988	XMoveResizeWindow (dpy, scrollBar.win,
989	window_sb_x, 0,
990	scrollBar.total_width (), szHint.height);
991	resize_scrollbar ();
992	}
993		1081
994	XMoveResizeWindow (dpy, vt,	1082	XMoveResizeWindow (dpy, vt,
995	window_vt_x, window_vt_y,	1083	window_vt_x, window_vt_y,
996	width, height);	1084	width, height);
997		1085
998	#ifdef HAVE_BG_PIXMAP	1086	#ifdef HAVE_BG_PIXMAP
999	if (bgPixmap.window_size_sensitive ())	1087	if (bgPixmap.window_size_sensitive ())
1000	update_background ();	1088	update_background ();
1001	#endif	1089	#endif
1002
1003	scr_clear ();
1004	}	1090	}
1005		1091
1006	if (fix_screen \|\| old_height == 0)	1092	if (fix_screen \|\| old_height == 0)
1007	scr_reset ();	1093	scr_reset ();
1008
1009	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1010	//scr_touch (false);
1011		1094
1012	#ifdef HAVE_BG_PIXMAP	1095	#ifdef HAVE_BG_PIXMAP
1013	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1096	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1014	// if (bgPixmap.pixmap)	1097	// if (bgPixmap.pixmap)
1015	// scr_touch (false);	1098	// scr_touch (false);
…		…
1087		1170
1088	/* Checking whether input method is running. */	1171	/* Checking whether input method is running. */
1089	bool	1172	bool
1090	rxvt_term::IMisRunning ()	1173	rxvt_term::IMisRunning ()
1091	{	1174	{
1092	char *p;
1093	Atom atom;	1175	Atom atom;
1094	Window win;	1176	Window win;
1095	char server[IMBUFSIZ];	1177	char server[IMBUFSIZ];
1096		1178
1097	/* get current locale modifier */	1179	/* get current locale modifier */
1098	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1180	if (char *p = XSetLocaleModifiers (0))
1099	{	1181	{
1100	strcpy (server, "@server=");	1182	strcpy (server, "@server=");
1101	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1183	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1102		1184
1103	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1185	if (p = strchr (server + 1, '@')) /* first one only */
1104	*p = '\0';	1186	*p = '\0';
1105		1187
1106	atom = XInternAtom (dpy, server, False);	1188	atom = XInternAtom (dpy, server, False);
1107	win = XGetSelectionOwner (dpy, atom);	1189	win = XGetSelectionOwner (dpy, atom);
1108		1190
…		…
1175		1257
1176	term->make_current ();	1258	term->make_current ();
1177		1259
1178	if (text)	1260	if (text)
1179	{	1261	{
1180	void *str;	1262	wchar_t *str;
1181		1263
1182	if (!text->encoding_is_wchar && text->string.multi_byte)	1264	if (!text->encoding_is_wchar && text->string.multi_byte)
1183	{	1265	{
1184	// of course, X makes it ugly again	1266	// of course, X makes it ugly again
1185	if (term->rs[Rs_imLocale])	1267	if (term->rs[Rs_imLocale])
1186	SET_LOCALE (term->rs[Rs_imLocale]);	1268	SET_LOCALE (term->rs[Rs_imLocale]);
1187		1269
1188	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1270	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1189	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1271	mbstowcs (str, text->string.multi_byte, text->length + 1);
1190		1272
1191	if (term->rs[Rs_imLocale])	1273	if (term->rs[Rs_imLocale])
1192	SET_LOCALE (term->locale);	1274	SET_LOCALE (term->locale);
1193	}	1275	}
1194	else	1276	else
1195	str = (void *)text->string.wide_char;	1277	str = text->string.wide_char;
1196		1278
1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1279	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198	DT_INT, call_data->caret,	1280	DT_INT, call_data->caret,
1199	DT_INT, call_data->chg_first,	1281	DT_INT, call_data->chg_first,
1200	DT_INT, call_data->chg_length,	1282	DT_INT, call_data->chg_length,
…		…
1554	void	1636	void
1555	rxvt_term::get_window_origin (int &x, int &y)	1637	rxvt_term::get_window_origin (int &x, int &y)
1556	{	1638	{
1557	Window cr;	1639	Window cr;
1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1640	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560	}	1641	}
1561		1642
1562	Pixmap	1643	Pixmap
1563	rxvt_term::get_pixmap_property (int prop_id)	1644	rxvt_term::get_pixmap_property (Atom property)
1564	{	1645	{
1565	if (prop_id > 0 && prop_id < NUM_XA)	1646	Pixmap pixmap = None;
1566	if (xa[prop_id])	1647
1567	{
1568	int aformat;	1648	int aformat;
1569	unsigned long nitems, bytes_after;	1649	unsigned long nitems, bytes_after;
1570	Atom atype;	1650	Atom atype;
1571	unsigned char *prop = NULL;	1651	unsigned char *prop;
1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1652	int result = XGetWindowProperty (dpy, display->root, property,
1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1653	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574	&nitems, &bytes_after, &prop);	1654	&nitems, &bytes_after, &prop);
1575	if (result == Success && prop && atype == XA_PIXMAP)	1655	if (result == Success)
		1656	{
		1657	if (atype == XA_PIXMAP)
1576	return (Pixmap )prop;	1658	pixmap = (Pixmap )prop;
		1659	XFree (prop);
1577	}	1660	}
1578		1661
1579	return None;	1662	return pixmap;
1580	}	1663	}
1581		1664
1582	#ifdef HAVE_BG_PIXMAP	1665	#ifdef HAVE_BG_PIXMAP
1583	# if TRACE_PIXMAPS
1584	# undef update_background
1585	void
1586	rxvt_term::trace_update_background (const char *file, int line)
1587	{
1588	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589	update_background ();
1590	}
1591	# endif
1592		1666
1593	void	1667	void
1594	rxvt_term::update_background ()	1668	rxvt_term::update_background ()
1595	{	1669	{
1596	if (update_background_ev.is_active ())	1670	if (update_background_ev.is_active ())

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs. Revision 1.346 by sf-exg, Sat Jan 8 10:37:21 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs.
Revision 1.346 by sf-exg, Sat Jan 8 10:37:21 2011 UTC