[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC

…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->start;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	if (!$BUTTON_STATE) {	101	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
90		105
91	$GRAB = $widget;	106	$GRAB = $widget;
92	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
93		108
94	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->cb->();
95	}	110	}
96		111
97	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
98		113	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	114	# mousewheel
100	if $GRAB;	115	$ev->{dx} = 0;
		116	$ev->{dy} = $ev->{button} * 2 - 9;
		117	$GRAB->emit (mouse_wheel => $ev);
		118	} else {
		119	$GRAB->emit (button_down => $ev)
		120	}
		121	}
101	}	122	}
102		123
103	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	125	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		126
107	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB \|\| $ROOT->find_widget ($ev->{x}, $ev->{y});
108		128
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		130
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
112	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		133
114	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	136	$grab->update if $grab;
117	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
118		138
		139	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	140	$TOOLTIP_WATCHER->cb->();
120	}	141	}
121	}	142	}
122		143
123	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
124	my ($ev) = @_;	145	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
126		147
127	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
128		149
129	if ($widget != $HOVER) {	150	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		151
132	$hover->update if $hover && $hover->{can_hover};	152	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	153	if $HOVER;
140	}	154	}
141		155
142	# convert position array to integers	156	# convert position array to integers
143	sub harmonize {	157	sub harmonize {
…		…
189		203
190	}	204	}
191	}	205	}
192		206
193	reconfigure_widgets;	207	reconfigure_widgets;
		208	}
		209
		210	#############################################################################
		211
		212	package CFClient::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
194	}	216	}
195		217
196	#############################################################################	218	#############################################################################
197		219
198	package CFClient::UI::Base;	220	package CFClient::UI::Base;
…		…
345	my ($self, $x, $y, $w, $h) = @_;	367	my ($self, $x, $y, $w, $h) = @_;
346		368
347	if ($self->{aspect}) {	369	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	370	my ($ow, $oh) = ($w, $h);
349		371
350	$w = List::Util::min $w, int $h * $self->{aspect};	372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
352		374
353	# use alignment to adjust x, y	375	# use alignment to adjust x, y
354		376
355	$x += int 0.5 * ($ow - $w);	377	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	378	$y += int 0.5 * ($oh - $h);
…		…
407		429
408	# translate global coordinates to local coordinate system	430	# translate global coordinates to local coordinate system
409	sub coord2local {	431	sub coord2local {
410	my ($self, $x, $y) = @_;	432	my ($self, $x, $y) = @_;
411		433
		434	Carp::confess unless $self->{parent};#d#
		435
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	436	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	437	}
414		438
415	# translate local coordinates to global coordinate system	439	# translate local coordinates to global coordinate system
416	sub coord2global {	440	sub coord2global {
417	my ($self, $x, $y) = @_;	441	my ($self, $x, $y) = @_;
418		442
		443	Carp::confess unless $self->{parent};#d#
		444
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	445	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	446	}
421		447
422	sub invoke_focus_in {	448	sub invoke_focus_in {
423	my ($self) = @_;	449	my ($self) = @_;
…		…
452		478
453	$FOCUS->emit ("focus_out") if $FOCUS;	479	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	480	$self->emit ("focus_in");
455	}	481	}
456		482
457	sub invoke_mouse_motion { 1 }	483	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	484	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	485	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	486	sub invoke_key_up { 0 }
		487	sub invoke_mouse_wheel { 0 }
461		488
462	sub invoke_button_down {	489	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	490	my ($self, $ev, $x, $y) = @_;
464		491
465	$self->grab_focus;	492	$self->grab_focus;
466		493
467	1	494	0
468	}	495	}
469		496
470	sub connect {	497	sub connect {
471	my ($self, $signal, $cb) = @_;	498	my ($self, $signal, $cb) = @_;
472		499
473	push @{ $self->{signal_cb}{$signal} }, $cb;	500	push @{ $self->{signal_cb}{$signal} }, $cb;
		501
		502	defined wantarray and CFClient::guard {
		503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		504	@{ $self->{signal_cb}{$signal} };
		505	}
474	}	506	}
		507
		508	my %has_coords = (
		509	button_down => 1,
		510	button_up => 1,
		511	mouse_motion => 1,
		512	mouse_wheel => 1,
		513	);
475		514
476	sub emit {	515	sub emit {
477	my ($self, $signal, @args) = @_;	516	my ($self, $signal, @args) = @_;
478		517
		518	# I do not really like this solution, but I dislike duplication
		519	# and needlessly verbose code, too.
		520	my @append
		521	= $has_coords{$signal}
		522	? $args[0]->xy ($self)
		523	: ();
		524
		525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		526
479	#d##TODO# stop propagating at first true, do not use sum	527	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} \|\| []}) # before	528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} \|\| []}) # before
481	\|\| ($self->can ("invoke_$signal") \|\| sub { 1 })->($self, @args) # closure	529	\|\| ($self->can ("invoke_$signal") \|\| sub { 1 })->($self, @args, @append) # closure
482	\|\| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	530	\|\| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	531	}
484		532
485	sub find_widget {	533	sub find_widget {
486	my ($self, $x, $y) = @_;	534	my ($self, $x, $y) = @_;
487		535
…		…
587	}	635	}
588		636
589	sub DESTROY {	637	sub DESTROY {
590	my ($self) = @_;	638	my ($self) = @_;
591		639
		640	return if CFClient::in_destruct;
		641
592	delete $WIDGET{$self+0};	642	delete $WIDGET{$self+0};
593		643
594	eval { $self->destroy };	644	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	646	}
…		…
679		729
680	$self->add (@$children)	730	$self->add (@$children)
681	if $children;	731	if $children;
682		732
683	$self	733	$self
		734	}
		735
		736	sub realloc {
		737	my ($self) = @_;
		738
		739	$self->{force_realloc} = 1;
		740	$self->{force_size_alloc} = 1;
		741	$self->SUPER::realloc;
684	}	742	}
685		743
686	sub add {	744	sub add {
687	my ($self, @widgets) = @_;	745	my ($self, @widgets) = @_;
688		746
…		…
975	$self->{vp}->set_offset (0, $_[1]);	1033	$self->{vp}->set_offset (0, $_[1]);
976	},	1034	},
977	;	1035	;
978		1036
979	$self = $class->SUPER::new (	1037	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1038	vp => (new CFClient::UI::ViewPort expand => 1),
		1039	can_events => 1,
981	slider => $slider,	1040	slider => $slider,
982	%arg,	1041	%arg,
983	);	1042	);
984		1043
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1044	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1045	$self->add ($child) if $child;
…		…
992		1051
993	sub add {	1052	sub add {
994	my ($self, $widget) = @_;	1053	my ($self, $widget) = @_;
995		1054
996	$self->{vp}->add ($self->{child} = $widget);	1055	$self->{vp}->add ($self->{child} = $widget);
		1056	}
		1057
		1058	sub invoke_mouse_wheel {
		1059	my ($self, $ev) = @_;
		1060
		1061	return 0 unless $ev->{dy}; # only vertical movements
		1062
		1063	$self->{slider}->emit (mouse_wheel => $ev);
		1064
		1065	1
997	}	1066	}
998		1067
999	sub update_slider {	1068	sub update_slider {
1000	my ($self) = @_;	1069	my ($self) = @_;
1001		1070
…		…
1080	my $self = $class->SUPER::new (	1149	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1150	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1151	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1152	border => 0.6,
1084	can_events => 1,	1153	can_events => 1,
1085	min_w => 16,	1154	min_w => 64,
1086	min_h => 16,	1155	min_h => 32,
1087	%arg,	1156	%arg,
1088	);	1157	);
1089		1158
1090	$self->{title_widget} = new CFClient::UI::Label	1159	$self->{title_widget} = new CFClient::UI::Label
1091	align => 0,	1160	align => 0,
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1296	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1297
1229	! ! $self->{motion}	1298	! ! $self->{motion}
1230	}	1299	}
1231		1300
		1301	sub invoke_visibility_change {
		1302	my ($self, $visible) = @_;
		1303
		1304	delete $self->{motion} unless $visible;
		1305
		1306	0
		1307	}
		1308
1232	sub _draw {	1309	sub _draw {
1233	my ($self) = @_;	1310	my ($self) = @_;
1234		1311
1235	my $child = $self->{children}[0];	1312	my $child = $self->{children}[0];
1236		1313
…		…
1295	sub children {	1372	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1374	}
1298		1375
1299	sub add {	1376	sub add {
1300	my ($self, $x, $y, $child) = @_;	1377	my ($self) = shift;
1301		1378
		1379	while (@_) {
		1380	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1381	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1382	$self->{children}[$y][$x] = $child;
		1383	}
1304		1384
		1385	$self->{force_realloc} = 1;
		1386	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1387	$self->realloc;
1306	}	1388	}
1307		1389
1308	sub remove {	1390	sub remove {
1309	my ($self, $child) = @_;	1391	my ($self, $child) = @_;
…		…
1561	}	1643	}
1562		1644
1563	$self	1645	$self
1564	}	1646	}
1565		1647
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&/g;
1570	s/>/>/g;
1571	s/</</g;
1572
1573	$_
1574	}
1575
1576	sub update {	1648	sub update {
1577	my ($self) = @_;	1649	my ($self) = @_;
1578		1650
1579	delete $self->{texture};	1651	delete $self->{texture};
1580	$self->SUPER::update;	1652	$self->SUPER::update;
…		…
1591	my ($self, $text) = @_;	1663	my ($self, $text) = @_;
1592		1664
1593	return if $self->{text} eq "T$text";	1665	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1666	$self->{text} = "T$text";
1595		1667
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	1668	$self->{layout}->set_text ($text);
1598		1669
1599	delete $self->{size_req};	1670	delete $self->{size_req};
1600	$self->realloc;	1671	$self->realloc;
1601	$self->update;	1672	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	1678	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	1679	$self->{text} = "M$markup";
1609		1680
1610	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1681	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1611		1682
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	1683	$self->{layout}->set_markup ($markup);
1614		1684
1615	delete $self->{size_req};	1685	delete $self->{size_req};
1616	$self->realloc;	1686	$self->realloc;
1617	$self->update;	1687	$self->update;
…		…
1629		1699
1630	my ($w, $h) = $self->{layout}->size;	1700	my ($w, $h) = $self->{layout}->size;
1631		1701
1632	if (exists $self->{template}) {	1702	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	1703	$self->{template}->set_font ($self->{font}) if $self->{font};
		1704	$self->{template}->set_width ($self->{max_w} \|\| -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1705	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		1706
1636	my ($w2, $h2) = $self->{template}->size;	1707	my ($w2, $h2) = $self->{template}->size;
1637		1708
1638	$w = List::Util::max $w, $w2;	1709	$w = List::Util::max $w, $w2;
…		…
1672		1743
1673	sub reconfigure {	1744	sub reconfigure {
1674	my ($self) = @_;	1745	my ($self) = @_;
1675		1746
1676	delete $self->{size_req};	1747	delete $self->{size_req};
		1748	delete $self->{texture};
1677		1749
1678	$self->SUPER::reconfigure;	1750	$self->SUPER::reconfigure;
1679	}	1751	}
1680		1752
1681	sub _draw {	1753	sub _draw {
1682	my ($self) = @_;	1754	my ($self) = @_;
1683		1755
1684	$self->SUPER::_draw; # draw background, if applicable	1756	$self->SUPER::_draw; # draw background, if applicable
1685		1757
1686	my $tex = $self->{texture} \|\|= do {	1758	my $size = $self->{texture} \|\|= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	1759	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	1760	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	1761	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	1762	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1763	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1764	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		1765
1694	new_from_layout CFClient::Texture $self->{layout}	1766	[$self->{layout}->size]
1695	};	1767	};
1696		1768
1697	unless (exists $self->{ox}) {	1769	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1770	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1771	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	1772	: ($self->{w} - $size->[0]) * 0.5);
1701		1773
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	1776	: ($self->{h} - $size->[1]) * 0.5);
1705	};	1777	};
1706		1778
1707	glEnable GL_TEXTURE_2D;
1708
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1781
1712	if ($tex->{format} == GL_ALPHA) {	1782	$self->{layout}->render ($self->{ox}, $self->{oy});
1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714	glColor @{$self->{fg}};
1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716	} else {
1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719	}
1720
1721	glDisable GL_TEXTURE_2D;
1722	}	1783	}
1723		1784
1724	#############################################################################	1785	#############################################################################
1725		1786
1726	package CFClient::UI::EntryBase;	1787	package CFClient::UI::EntryBase;
…		…
1837		1898
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	1899	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		1900
1840	# byte-index to char-index	1901	# byte-index to char-index
1841	my $text = $self->{text};	1902	my $text = $self->{text};
1842	utf8::encode $text;	1903	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	1904	$self->{cursor} = length $text;
1844		1905
1845	$self->_set_text ($self->{text});	1906	$self->_set_text ($self->{text});
1846	$self->update;	1907	$self->update;
1847		1908
1848	1	1909	1
…		…
2000	$self->SUPER::_draw;	2061	$self->SUPER::_draw;
2001	}	2062	}
2002		2063
2003	#############################################################################	2064	#############################################################################
2004		2065
		2066	package CFClient::UI::CheckBox;
		2067
		2068	our @ISA = CFClient::UI::DrawBG::;
		2069
		2070	my @tex =
		2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2073
		2074	use CFClient::OpenGL;
		2075
		2076	sub new {
		2077	my $class = shift;
		2078
		2079	$class->SUPER::new (
		2080	padding_x => 2,
		2081	padding_y => 2,
		2082	fg => [1, 1, 1],
		2083	active_fg => [1, 1, 0],
		2084	bg => [0, 0, 0, 0.2],
		2085	active_bg => [1, 1, 1, 0.5],
		2086	state => 0,
		2087	can_hover => 1,
		2088	@_
		2089	)
		2090	}
		2091
		2092	sub size_request {
		2093	my ($self) = @_;
		2094
		2095	(6) x 2
		2096	}
		2097
		2098	sub toggle {
		2099	my ($self) = @_;
		2100
		2101	$self->{state} = !$self->{state};
		2102	$self->emit (changed => $self->{state});
		2103	$self->update;
		2104	}
		2105
		2106	sub invoke_button_down {
		2107	my ($self, $ev, $x, $y) = @_;
		2108
		2109	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2110	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2111	$self->toggle;
		2112	} else {
		2113	return 0
		2114	}
		2115
		2116	1
		2117	}
		2118
		2119	sub _draw {
		2120	my ($self) = @_;
		2121
		2122	$self->SUPER::_draw;
		2123
		2124	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2125
		2126	my ($w, $h) = @$self{qw(w h)};
		2127
		2128	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2129
		2130	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2131
		2132	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2133
		2134	glEnable GL_TEXTURE_2D;
		2135	$tex->draw_quad_alpha (0, 0, $s, $s);
		2136	glDisable GL_TEXTURE_2D;
		2137	}
		2138
		2139	#############################################################################
		2140
		2141	package CFClient::UI::Image;
		2142
		2143	our @ISA = CFClient::UI::Base::;
		2144
		2145	use CFClient::OpenGL;
		2146
		2147	our %texture_cache;
		2148
		2149	sub new {
		2150	my $class = shift;
		2151
		2152	my $self = $class->SUPER::new (
		2153	can_events => 0,
		2154	@_,
		2155	);
		2156
		2157	$self->{path} \|\| $self->{tex}
		2158	or Carp::croak "'path' or 'tex' attributes required";
		2159
		2160	$self->{tex} \|\|= $texture_cache{$self->{path}} \|\|=
		2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
		2162
		2163	Scalar::Util::weaken $texture_cache{$self->{path}};
		2164
		2165	$self->{aspect} \|\|= $self->{tex}{w} / $self->{tex}{h};
		2166
		2167	$self
		2168	}
		2169
		2170	sub STORABLE_freeze {
		2171	my ($self, $cloning) = @_;
		2172
		2173	$self->{path}
		2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
		2175
		2176	$self->{path}
		2177	}
		2178
		2179	sub STORABLE_attach {
		2180	my ($self, $cloning, $path) = @_;
		2181
		2182	$self->new (path => $path)
		2183	}
		2184
		2185	sub size_request {
		2186	my ($self) = @_;
		2187
		2188	($self->{tex}{w}, $self->{tex}{h})
		2189	}
		2190
		2191	sub _draw {
		2192	my ($self) = @_;
		2193
		2194	my $tex = $self->{tex};
		2195
		2196	my ($w, $h) = ($self->{w}, $self->{h});
		2197
		2198	if ($self->{rot90}) {
		2199	glRotate 90, 0, 0, 1;
		2200	glTranslate 0, -$self->{w}, 0;
		2201
		2202	($w, $h) = ($h, $w);
		2203	}
		2204
		2205	glEnable GL_TEXTURE_2D;
		2206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2207
		2208	$tex->draw_quad (0, 0, $w, $h);
		2209
		2210	glDisable GL_TEXTURE_2D;
		2211	}
		2212
		2213	#############################################################################
		2214
2005	package CFClient::UI::ImageButton;	2215	package CFClient::UI::ImageButton;
2006		2216
2007	our @ISA = CFClient::UI::Image::;	2217	our @ISA = CFClient::UI::Image::;
2008		2218
2009	use CFClient::OpenGL;	2219	use CFClient::OpenGL;
…		…
2032	$self->emit ("activate")	2242	$self->emit ("activate")
2033	if $x >= 0 && $x < $self->{w}	2243	if $x >= 0 && $x < $self->{w}
2034	&& $y >= 0 && $y < $self->{h};	2244	&& $y >= 0 && $y < $self->{h};
2035		2245
2036	1	2246	1
2037	}
2038
2039	#############################################################################
2040
2041	package CFClient::UI::CheckBox;
2042
2043	our @ISA = CFClient::UI::DrawBG::;
2044
2045	my @tex =
2046	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049	use CFClient::OpenGL;
2050
2051	sub new {
2052	my $class = shift;
2053
2054	$class->SUPER::new (
2055	padding_x => 2,
2056	padding_y => 2,
2057	fg => [1, 1, 1],
2058	active_fg => [1, 1, 0],
2059	bg => [0, 0, 0, 0.2],
2060	active_bg => [1, 1, 1, 0.5],
2061	state => 0,
2062	can_hover => 1,
2063	@_
2064	)
2065	}
2066
2067	sub size_request {
2068	my ($self) = @_;
2069
2070	(6) x 2
2071	}
2072
2073	sub toggle {
2074	my ($self) = @_;
2075
2076	$self->{state} = !$self->{state};
2077	$self->emit (changed => $self->{state});
2078	$self->update;
2079	}
2080
2081	sub invoke_button_down {
2082	my ($self, $ev, $x, $y) = @_;
2083
2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086	$self->toggle;
2087	} else {
2088	return 0
2089	}
2090
2091	1
2092	}
2093
2094	sub _draw {
2095	my ($self) = @_;
2096
2097	$self->SUPER::_draw;
2098
2099	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101	my ($w, $h) = @$self{qw(w h)};
2102
2103	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107	my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109	glEnable GL_TEXTURE_2D;
2110	$tex->draw_quad_alpha (0, 0, $s, $s);
2111	glDisable GL_TEXTURE_2D;
2112	}
2113
2114	#############################################################################
2115
2116	package CFClient::UI::Image;
2117
2118	our @ISA = CFClient::UI::Base::;
2119
2120	use CFClient::OpenGL;
2121
2122	our %texture_cache;
2123
2124	sub new {
2125	my $class = shift;
2126
2127	my $self = $class->SUPER::new (
2128	can_events => 0,
2129	@_,
2130	);
2131
2132	$self->{path}
2133	or Carp::croak "required attribute 'path' not set";
2134
2135	$self->{tex} = $texture_cache{$self->{path}} \|\|=
2136	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140	$self->{aspect} \|\|= $self->{tex}{w} / $self->{tex}{h};
2141
2142	$self
2143	}
2144
2145	sub size_request {
2146	my ($self) = @_;
2147
2148	($self->{tex}{w}, $self->{tex}{h})
2149	}
2150
2151	sub _draw {
2152	my ($self) = @_;
2153
2154	my $tex = $self->{tex};
2155
2156	my ($w, $h) = ($self->{w}, $self->{h});
2157
2158	if ($self->{rot90}) {
2159	glRotate 90, 0, 0, 1;
2160	glTranslate 0, -$self->{w}, 0;
2161
2162	($w, $h) = ($h, $w);
2163	}
2164
2165	glEnable GL_TEXTURE_2D;
2166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168	$tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170	glDisable GL_TEXTURE_2D;
2171	}	2247	}
2172		2248
2173	#############################################################################	2249	#############################################################################
2174		2250
2175	package CFClient::UI::VGauge;	2251	package CFClient::UI::VGauge;
…		…
2460	}	2536	}
2461		2537
2462	1	2538	1
2463	}	2539	}
2464		2540
		2541	sub invoke_mouse_wheel {
		2542	my ($self, $ev) = @_;
		2543
		2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2545
		2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2547
		2548	! ! $delta
		2549	}
		2550
2465	sub update {	2551	sub update {
2466	my ($self) = @_;	2552	my ($self) = @_;
2467		2553
2468	delete $self->{knob_w};	2554	delete $self->{knob_w};
2469	$self->SUPER::update;	2555	$self->SUPER::update;
…		…
2568	sub new {	2654	sub new {
2569	my $class = shift;	2655	my $class = shift;
2570		2656
2571	my $self = $class->SUPER::new (	2657	my $self = $class->SUPER::new (
2572	fontsize => 1,	2658	fontsize => 1,
2573	can_events => 0,	2659	can_events => 1,
2574	indent => 0,	2660	indent => 0,
2575	#font => default_font	2661	#font => default_font
2576	@_,	2662	@_,
2577		2663
2578	layout => (new CFClient::Layout 1),	2664	layout => (new CFClient::Layout),
2579	par => [],	2665	par => [],
2580	height => 0,	2666	height => 0,
2581	children => [	2667	children => [
2582	(new CFClient::UI::Empty expand => 1),	2668	(new CFClient::UI::Empty expand => 1),
2583	(new CFClient::UI::Slider vertical => 1),	2669	(new CFClient::UI::Slider vertical => 1),
…		…
2620		2706
2621	local $self->{children} = [$empty, $slider];	2707	local $self->{children} = [$empty, $slider];
2622	$self->SUPER::invoke_size_allocate ($w, $h)	2708	$self->SUPER::invoke_size_allocate ($w, $h)
2623	}	2709	}
2624		2710
		2711	sub invoke_mouse_wheel {
		2712	my ($self, $ev) = @_;
		2713
		2714	return 0 unless $ev->{dy}; # only vertical movements
		2715
		2716	$self->{children}[1]->emit (mouse_wheel => $ev);
		2717
		2718	1
		2719	}
		2720
2625	sub get_layout {	2721	sub get_layout {
2626	my ($self, $para) = @_;	2722	my ($self, $para) = @_;
2627		2723
2628	my $layout = $self->{layout};	2724	my $layout = $self->{layout};
2629		2725
…		…
2667	$self->{height} = 0;	2763	$self->{height} = 0;
2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2764	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669	}	2765	}
2670		2766
2671	sub add_paragraph {	2767	sub add_paragraph {
2672	my ($self, $color, $para, $indent) = @_;	2768	my $self = shift;
2673		2769
2674	my ($text, @w) = ref $para ? @$para : $para;	2770	for my $para (@_) {
2675
2676	$para = {	2771	$para = {
		2772	fg => [1, 1, 1, 1],
		2773	indent => 0,
		2774	markup => "",
		2775	widget => [],
		2776	ref $para ? %$para : (markup => $para),
2677	w => 1e10,	2777	w => 1e10,
2678	wrapped => 1,	2778	wrapped => 1,
2679	fg => $color,
2680	indent => $indent,
2681	markup => $text,
2682	widget => \@w,
2683	};	2779	};
2684		2780
2685	$self->add (@w) if @w;	2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686	push @{$self->{par}}, $para;	2782	push @{$self->{par}}, $para;
		2783	}
2687		2784
2688	$self->{need_reflow}++;	2785	$self->{need_reflow}++;
2689	$self->update;	2786	$self->update;
2690	}	2787	}
2691		2788
…		…
2744	my $y0 = $top;	2841	my $y0 = $top;
2745	my $y1 = $top + $H;	2842	my $y1 = $top + $H;
2746		2843
2747	my $y = 0;	2844	my $y = 0;
2748		2845
2749	glEnable GL_BLEND;
2750	#TODO# not correct in windows where rgba is forced off
2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753	for my $para (@{$self->{par}}) {	2846	for my $para (@{$self->{par}}) {
2754	my $h = $para->{h};	2847	my $h = $para->{h};
2755		2848
2756	if ($y0 < $y + $h && $y < $y1) {	2849	if ($y0 < $y + $h && $y < $y1) {
2757		2850
2758	my $layout = $self->get_layout ($para);	2851	my $layout = $self->get_layout ($para);
2759		2852
2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762	glRasterPos $para->{indent}, $y - $y0;	2853	$layout->render ($para->{indent}, $y - $y0);
2763	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764		2854
2765	if (my @w = @{ $para->{widget} }) {	2855	if (my @w = @{ $para->{widget} }) {
2766	my @s = $layout->get_shapes;	2856	my @s = $layout->get_shapes;
2767		2857
2768	glDisable GL_BLEND;
2769	for (@w) {	2858	for (@w) {
2770	my ($dx, $dy) = splice @s, 0, 2, ();	2859	my ($dx, $dy) = splice @s, 0, 2, ();
2771		2860
2772	$_->{x} = $dx + $para->{indent};	2861	$_->{x} = $dx + $para->{indent};
2773	$_->{y} = $dy + $y - $y0;	2862	$_->{y} = $dy + $y - $y0;
2774		2863
2775	$_->draw;	2864	$_->draw;
2776	}	2865	}
2777	glEnable GL_BLEND;
2778	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779	}	2866	}
2780	}	2867	}
2781		2868
2782	$y += $h;	2869	$y += $h;
2783	}	2870	}
2784
2785	glDisable GL_BLEND;
2786	};	2871	};
2787	});	2872	});
2788	}	2873	}
2789		2874
2790	sub reconfigure {	2875	sub reconfigure {
…		…
2937		3022
2938	$self->{root}->on_post_alloc ("move_$self" => sub {	3023	$self->{root}->on_post_alloc ("move_$self" => sub {
2939	my $widget = $self->{owner}	3024	my $widget = $self->{owner}
2940	or return;	3025	or return;
2941		3026
		3027	if ($widget->{visible}) {
2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3028	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943		3029
2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3030	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945	if $x + $self->{w} > $self->{root}{w};	3031	if $x + $self->{w} > $self->{root}{w};
2946		3032
2947	$self->move_abs ($x, $y);	3033	$self->move_abs ($x, $y);
		3034	} else {
		3035	$self->hide;
		3036	}
2948	});	3037	});
2949	}	3038	}
2950		3039
2951	sub _draw {	3040	sub _draw {
2952	my ($self) = @_;	3041	my ($self) = @_;
…		…
2978		3067
2979	#############################################################################	3068	#############################################################################
2980		3069
2981	package CFClient::UI::Face;	3070	package CFClient::UI::Face;
2982		3071
2983	our @ISA = CFClient::UI::Base::;	3072	our @ISA = CFClient::UI::DrawBG::;
2984		3073
2985	use CFClient::OpenGL;	3074	use CFClient::OpenGL;
2986		3075
2987	sub new {	3076	sub new {
2988	my $class = shift;	3077	my $class = shift;
…		…
3025	sub _draw {	3114	sub _draw {
3026	my ($self) = @_;	3115	my ($self) = @_;
3027		3116
3028	return unless $::CONN;	3117	return unless $::CONN;
3029		3118
		3119	$self->SUPER::_draw;
		3120
3030	my $face;	3121	my $face;
3031		3122
3032	if ($self->{frame}) {	3123	if ($self->{frame}) {
3033	my $anim = $::CONN->{anim}[$self->{anim}];	3124	my $anim = $::CONN->{anim}[$self->{anim}];
3034		3125
…		…
3086	for my $item (@{ $self->{items} }) {	3177	for my $item (@{ $self->{items} }) {
3087	my ($widget, $cb, $tooltip) = @$item;	3178	my ($widget, $cb, $tooltip) = @$item;
3088		3179
3089	# handle various types of items, only text for now	3180	# handle various types of items, only text for now
3090	if (!ref $widget) {	3181	if (!ref $widget) {
		3182	if ($widget =~ /\t/) {
		3183	my ($left, $right) = split /\t/, $widget, 2;
		3184
		3185	$widget = new CFClient::UI::HBox
		3186	can_hover => 1,
		3187	can_events => 1,
		3188	tooltip => $tooltip,
		3189	children => [
		3190	(new CFClient::UI::Label markup => $left, expand => 1),
		3191	(new CFClient::UI::Label markup => $right, align => +1),
		3192	],
		3193	;
		3194
		3195	} else {
3091	$widget = new CFClient::UI::Label	3196	$widget = new CFClient::UI::Label
3092	can_hover => 1,	3197	can_hover => 1,
3093	can_events => 1,	3198	can_events => 1,
3094	markup => $widget,	3199	markup => $widget,
3095	tooltip => $tooltip	3200	tooltip => $tooltip;
		3201	}
3096	}	3202	}
3097		3203
3098	$self->{item}{$widget} = $item;	3204	$self->{item}{$widget} = $item;
3099		3205
3100	$self->{vbox}->add ($widget);	3206	$self->{vbox}->add ($widget);
…		…
3265	$self->emit (page_changed => $self->{multiplexer}{current});	3371	$self->emit (page_changed => $self->{multiplexer}{current});
3266	}	3372	}
3267		3373
3268	#############################################################################	3374	#############################################################################
3269		3375
3270	package CFClient::UI::Combobox;	3376	package CFClient::UI::Selector;
3271		3377
3272	use utf8;	3378	use utf8;
3273		3379
3274	our @ISA = CFClient::UI::Button::;	3380	our @ISA = CFClient::UI::Button::;
3275		3381
…		…
3475	sub new {	3581	sub new {
3476	my $class = shift;	3582	my $class = shift;
3477		3583
3478	my $self = $class->SUPER::new (	3584	my $self = $class->SUPER::new (
3479	col_expand => [0, 1, 0],	3585	col_expand => [0, 1, 0],
		3586	items => [],
3480	@_,	3587	@_,
3481	);	3588	);
3482		3589
		3590	$self->set_sort_order (undef);
		3591
3483	$self	3592	$self
		3593	}
		3594
		3595	sub update_items {
		3596	my ($self) = @_;
		3597
		3598	$self->clear;
		3599
		3600	my @item = $self->{sort}->(@{ $self->{items} });
		3601
		3602	my @adds;
		3603	my $row = 0;
		3604	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3605	CFClient::Item::update_widgets $item;
		3606
		3607	push @adds, 0, $row, $item->{face_widget};
		3608	push @adds, 1, $row, $item->{desc_widget};
		3609	push @adds, 2, $row, $item->{weight_widget};
		3610
		3611	$row++;
		3612	}
		3613
		3614	$self->add (@adds);
		3615	}
		3616
		3617	sub set_sort_order {
		3618	my ($self, $order) = @_;
		3619
		3620	$self->{sort} = $order \|\|= sub {
		3621	sort {
		3622	$a->{type} <=> $b->{type}
		3623	or $a->{name} cmp $b->{name}
		3624	} @_
		3625	};
		3626
		3627	$self->update_items;
3484	}	3628	}
3485		3629
3486	sub set_items {	3630	sub set_items {
3487	my ($self, $items) = @_;	3631	my ($self, $items) = @_;
3488		3632
3489	$self->clear;	3633	$self->{items} = [$items ? values %$items : ()];
3490	return unless $items;	3634	$self->update_items;
3491
3492	my @items = sort {
3493	($a->{type} <=> $b->{type})
3494	or ($a->{name} cmp $b->{name})
3495	} values %$items;
3496
3497	$self->{real_items} = \@items;
3498
3499	my $row = 0;
3500	for my $item (@items) {
3501	CFClient::Item::update_widgets $item;
3502
3503	$self->add (0, $row, $item->{face_widget});
3504	$self->add (1, $row, $item->{desc_widget});
3505	$self->add (2, $row, $item->{weight_widget});
3506
3507	$row++;
3508	}
3509	}	3635	}
3510		3636
3511	#############################################################################	3637	#############################################################################
3512		3638
3513	package CFClient::UI::SpellList;	3639	package CFClient::UI::SpellList;
…		…
3822	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3948	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823		3949
3824	$w = 0 if $w < 0;	3950	$w = 0 if $w < 0;
3825	$h = 0 if $h < 0;	3951	$h = 0 if $h < 0;
3826		3952
		3953	$w = max $widget->{min_w}, $w;
		3954	$h = max $widget->{min_h}, $h;
		3955
		3956	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3957	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3958
		3959	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3960	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3961
3827	$w = int $w + 0.5;	3962	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	3963	$h = int $h + 0.5;
3829		3964
3830	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	3965	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
3831	$widget->{old_w} = $widget->{w};	3966	$widget->{old_w} = $widget->{w};

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC vs. Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC