ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.430 by root, Tue Aug 21 02:39:17 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
		11	use CFPlus::Texture;
10		12
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		14
		15	our $LAYOUT;
13	our $ROOT;	16	our $ROOT;
14	our $TOOLTIP;	17	our $TOOLTIP;
15	our $BUTTON_STATE;	18	our $BUTTON_STATE;
16		19
17	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
18		21
19	sub check_tooltip {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20	if (!$GRAB) {	23	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		28	$TOOLTIP->hide;
		29
25	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
26		34
27	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
28		36
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	37	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		38
31	$TOOLTIP->set_tooltip_from ($widget);	39	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	40	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38	}
39
40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;
42	$TOOLTIP->update;
43	}	41	}
44		42
45	return;	43	return;
46	}	44	}
47	}	45	}
48	}	46	}
49		47
50	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
51	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
		51	});
		52
		53	sub get_layout {
		54	my $layout;
		55
		56	for (grep { $_->{name} } values %WIDGET) {
		57	my $win = $layout->{$_->{name}} = { };
		58
		59	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		60	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		61	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		62	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		63
		64	$win->{show} = $_->{visible} && $_->{is_toplevel};
		65	}
		66
		67	$layout
		68	}
		69
		70	sub set_layout {
		71	my ($layout) = @_;
		72
		73	$LAYOUT = $layout;
52	}	74	}
53		75
54	# class methods for events	76	# class methods for events
55	sub feed_sdl_key_down_event {	77	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	78	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	79	if $FOCUS;
58	}	80	}
59		81
60	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	83	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	84	if $FOCUS;
		85	}
		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
63	}	98	}
64		99
65	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	101	my ($ev) = @_;
67	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
68		103
69	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
70	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
71		108
72	$GRAB = $widget;	109	$GRAB = $widget;
73	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
74		111
75	check_tooltip;	112	$TOOLTIP_WATCHER->cb->();
76	}	113	}
77
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		114
80	if ($GRAB) {	115	if ($GRAB) {
81	($x, $y) = $GRAB->coord2local ($x, $y);	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);	117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
83	}	128	}
84	}	129	}
85		130
86	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	132	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});
89		133
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
91		135
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		137
94	if ($GRAB) {	138	$GRAB->emit (button_up => $ev)
95	($x, $y) = $GRAB->coord2local ($x, $y);	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		140
99	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	143	$grab->update if $grab;
102	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
103		145
104	check_tooltip;	146	check_hover $widget;
		147	$TOOLTIP_WATCHER->cb->();
105	}	148	}
106	}	149	}
107		150
108	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
109	my ($ev) = @_;	152	my ($ev) = @_;
110	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
111		154
112	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
113		156
114	if ($widget != $HOVER) {	157	check_hover $widget;
115	my $hover = $HOVER; $HOVER = $widget;
116		158
117	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
118	$HOVER->update if $HOVER && $HOVER->{can_hover};
119
120	check_tooltip;
121	}
122
123	if ($HOVER) {	160	if $HOVER;
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
126	}
127	}	161	}
128		162
129	# convert position array to integers	163	# convert position array to integers
130	sub harmonize {	164	sub harmonize {
131	my ($vals) = @_;	165	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	171	$rem += $_ - $i;
138	$_ = $i;	172	$_ = $i;
139	}	173	}
140	}	174	}
141		175
		176	sub full_refresh {
		177	# make a copy, otherwise for complains about freed values.
		178	my @widgets = values %WIDGET;
		179
		180	$_->update
		181	for @widgets;
		182	}
		183
		184	sub reconfigure_widgets {
		185	# make a copy, otherwise C<for> complains about freed values.
		186	my @widgets = values %WIDGET;
		187
		188	$_->reconfigure
		189	for @widgets;
		190	}
		191
142	# call when resolution changes etc.	192	# call when resolution changes etc.
143	sub rescale_widgets {	193	sub rescale_widgets {
144	my ($sx, $sy) = @_;	194	my ($sx, $sy) = @_;
145		195
146	for my $widget (values %WIDGET) {	196	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	197	if ($widget->{is_toplevel}) {
		198	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		199	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		200
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	201	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	202	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	203	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	204	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	205	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	206	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	207
		208	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		209	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		210
156	}	211	}
157
158	$widget->reconfigure;
159	}	212	}
		213
		214	reconfigure_widgets;
160	}	215	}
161		216
162	#############################################################################	217	#############################################################################
163		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
164	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
165		228
166	use strict;	229	use strict;
167		230
168	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
169		232
170	sub new {	233	sub new {
171	my $class = shift;	234	my $class = shift;
172		235
173	my $self = bless {	236	my $self = bless {
174	x => 0,	237	x => "center",
175	y => 0,	238	y => "center",
176	z => 0,	239	z => 0,
		240	w => undef,
		241	h => undef,
177	can_events => 1,	242	can_events => 1,
178	@_	243	@_
179	}, $class;	244	}, $class;
180		245
		246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
		247
181	for (keys %$self) {	248	for (keys %$self) {
182	if (/^connect_(.*)$/) {	249	if (/^on_(.*)$/) {
183	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
184	}	251	}
185	}	252	}
186		253
187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
		255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
		256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
		257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
		258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
		259
		260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		262
		263	$self->show if $layout->{show};
		264	}
188		265
189	$self	266	$self
190	}	267	}
191		268
192	sub destroy {	269	sub destroy {
193	my ($self) = @_;	270	my ($self) = @_;
194		271
195	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
196	%$self = ();	274	%$self = ();
197	}	275	}
198		276
		277	sub TO_JSON {
		278	{ __w_ => $_[0]{s_id} }
		279	}
		280
199	sub show {	281	sub show {
200	my ($self) = @_;	282	my ($self) = @_;
201		283
202	return if $self->{parent};	284	return if $self->{parent};
203		285
204	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
205	}	287	}
206		288
207	sub hide {	289	sub set_visible {
208	my ($self) = @_;	290	my ($self) = @_;
		291
		292	return if $self->{visible};
		293
		294	$self->{root} = $self->{parent}{root};
		295	$self->{visible} = $self->{parent}{visible} + 1;
		296
		297	$self->emit (visibility_change => 1);
		298
		299	$self->realloc if !exists $self->{req_w};
		300
		301	$_->set_visible for $self->children;
		302	}
		303
		304	sub set_invisible {
		305	my ($self) = @_;
		306
		307	return unless $self->{visible};
		308
		309	$_->set_invisible for $self->children;
		310
		311	delete $self->{visible};
		312	delete $self->{root};
209		313
210	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
212		316
		317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
		318	if $TOOLTIP->{owner} == $self;
		319
		320	$self->emit ("focus_out");
		321	$self->emit (visibility_change => 0);
		322	}
		323
		324	sub set_visibility {
		325	my ($self, $visible) = @_;
		326
		327	return if $self->{visible} == $visible;
		328
		329	$visible ? $self->show
		330	: $self->hide;
		331	}
		332
		333	sub toggle_visibility {
		334	my ($self) = @_;
		335
		336	$self->{visible}
		337	? $self->hide
		338	: $self->show;
		339	}
		340
		341	sub hide {
		342	my ($self) = @_;
		343
		344	$self->set_invisible;
		345
213	$self->{parent}->remove ($self)	346	$self->{parent}->remove ($self)
214	if $self->{parent};	347	if $self->{parent};
215	}	348	}
216		349
217	sub move {	350	sub move_abs {
218	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
219		352
220	$self->{x} = int $x;	353	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
221	$self->{y} = int $y;	354	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
222	$self->{z} = $z if defined $z;	355	$self->{z} = $z if defined $z;
223		356
224	$self->update;	357	$self->update;
225	}	358	}
226		359
227	sub set_size {	360	sub set_size {
228	my ($self, $w, $h) = @_;	361	my ($self, $w, $h) = @_;
229		362
230	$self->{user_w} = $w;	363	$self->{force_w} = $w;
231	$self->{user_h} = $h;	364	$self->{force_h} = $h;
232		365
233	$self->check_size;	366	$self->realloc;
234	}	367	}
235		368
236	sub size_request {	369	sub size_request {
237	require Carp;	370	require Carp;
238	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
239	}	372	}
240		373
		374	sub baseline_shift {
		375	0
		376	}
		377
241	sub configure {	378	sub configure {
242	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
243		380
244	if ($self->{aspect}) {	381	if ($self->{aspect}) {
		382	my ($ow, $oh) = ($w, $h);
		383
245	my $w2 = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
246	my $h2 = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
247		386
248	# use alignment to adjust x, y	387	# use alignment to adjust x, y
249		388
250	$x += int +($w - $w2) * 0.5;	389	$x += int 0.5 * ($ow - $w);
251	$y += int +($h - $h2) * 0.5;	390	$y += int 0.5 * ($oh - $h);
252
253	($w, $h) = ($w2, $h2);
254	}	391	}
255		392
256	if ($self->{x} != $x || $self->{y} != $y) {	393	if ($self->{x} ne $x || $self->{y} ne $y) {
257	$self->{x} = $x;	394	$self->{x} = $x;
258	$self->{y} = $y;	395	$self->{y} = $y;
259	$self->update;	396	$self->update;
260	}	397	}
261		398
262	if ($self->{w} != $w || $self->{h} != $h) {	399	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	400	return unless $self->{visible};
264	}
265	}
266		401
267	sub size_allocate {	402	$self->{alloc_w} = $w;
268	# nothing to be done	403	$self->{alloc_h} = $h;
269	}
270		404
271	sub reconfigure {	405	$self->{root}{size_alloc}{$self+0} = $self;
272	my ($self) = @_;	406	}
273
274	$self->check_size (1);
275	$self->update;
276	}	407	}
277		408
278	sub children {	409	sub children {
		410	# nop
		411	}
		412
		413	sub visible_children {
		414	$_[0]->children
279	}	415	}
280		416
281	sub set_max_size {	417	sub set_max_size {
282	my ($self, $w, $h) = @_;	418	my ($self, $w, $h) = @_;
283		419
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	420	$self->{max_w} = int $w if defined $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	421	$self->{max_h} = int $h if defined $h;
		422
		423	$self->realloc;
		424	}
		425
		426	sub set_tooltip {
		427	my ($self, $tooltip) = @_;
		428
		429	$tooltip =~ s/^\s+//;
		430	$tooltip =~ s/\s+$//;
		431
		432	return if $self->{tooltip} eq $tooltip;
		433
		434	$self->{tooltip} = $tooltip;
		435
		436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
		437	delete $CFPlus::UI::TOOLTIP->{owner};
		438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
		439	}
286	}	440	}
287		441
288	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
289	sub coord2local {	443	sub coord2local {
290	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
291		445
		446	Carp::confess unless $self->{parent};#d#
		447
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
293	}	449	}
294		450
295	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
296	sub coord2global {	452	sub coord2global {
297	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
298		454
		455	Carp::confess unless $self->{parent};#d#
		456
299	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
300	}	458	}
301		459
302	sub focus_in {	460	sub invoke_focus_in {
303	my ($self) = @_;	461	my ($self) = @_;
304		462
305	return if $FOCUS == $self;	463	return if $FOCUS == $self;
306	return unless $self->{can_focus};	464	return unless $self->{can_focus};
307		465
308	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
309		467
310	$self->emit (focus_in => $focus);	468	$self->update;
311		469
312	$focus->update if $focus;	470	0
313	$FOCUS->update;
314	}	471	}
315		472
316	sub focus_out {	473	sub invoke_focus_out {
317	my ($self) = @_;	474	my ($self) = @_;
318		475
319	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
320		477
321	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
322		479
323	$self->emit (focus_out => $focus);	480	$self->update;
324		481
325	$focus->update if $focus; #?	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
326	}	483	unless $FOCUS;
327		484
		485	0
		486	}
		487
		488	sub grab_focus {
		489	my ($self) = @_;
		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
		492	$self->emit ("focus_in");
		493	}
		494
328	sub mouse_motion { }	495	sub invoke_mouse_motion { 0 }
329	sub button_up { }	496	sub invoke_button_up { 0 }
330	sub key_down { }	497	sub invoke_key_down { 0 }
331	sub key_up { }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
332		500
333	sub button_down {	501	sub invoke_button_down {
334	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
335		503
336	$self->focus_in;	504	$self->grab_focus;
337	}
338		505
339	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	506	0
340	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	507	}
341	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
342	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
343	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
344		508
345	sub draw {	509	sub connect {
		510	my ($self, $signal, $cb) = @_;
		511
		512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
346	my ($self) = @_;	521	my ($self, $signal) = @_;
347		522
348	return unless $self->{h} && $self->{w};	523	delete $self->{signal_cb}{$signal};
349
350	glPushMatrix;
351	glTranslate $self->{x}, $self->{y}, 0;
352	$self->_draw;
353	glPopMatrix;
354
355	if ($self == $HOVER && $self->{can_hover}) {
356	my ($x, $y) = @$self{qw(x y)};
357
358	glColor 1, 0.8, 0.5, 0.2;
359	glEnable GL_BLEND;
360	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
361	glBegin GL_QUADS;
362	glVertex $x , $y;
363	glVertex $x + $self->{w}, $y;
364	glVertex $x + $self->{w}, $y + $self->{h};
365	glVertex $x , $y + $self->{h};
366	glEnd;
367	glDisable GL_BLEND;
368	}
369
370	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;
372	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;
376	glVertex $self->{w}, 0;
377	glVertex $self->{w}, $self->{h};
378	glVertex 0 , $self->{h};
379	glEnd;
380	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}
383	}	524	}
384		525
385	sub _draw {	526	my %has_coords = (
386	my ($self) = @_;	527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
387		532
388	warn "no draw defined for $self\n";	533	sub emit {
389	}	534	my ($self, $signal, @args) = @_;
390		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
		547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
		553	$self->{parent} && $self->{parent}->emit ($signal, @args)
		554	}
		555
391	sub find_widget {	556	#sub find_widget {
392	my ($self, $x, $y) = @_;	557	# in .xs
393
394	return () unless $self->{can_events};
395
396	return $self
397	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400	()
401	}
402		558
403	sub set_parent {	559	sub set_parent {
404	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
405		561
406	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
407		563	$self->set_visible if $parent->{visible};
408	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size
410	unless exists $self->{req_w};
411	}	564	}
412		565
413	sub check_size {	566	sub realloc {
414	my ($self, $forced) = @_;	567	my ($self) = @_;
415		568
416	$self->{force_alloc} = 1 if $forced;	569	if ($self->{visible}) {
417	$CFClient::UI::ROOT->{check_size}{$self} = $self;	570	return if $self->{root}{realloc}{$self+0};
		571
		572	$self->{root}{realloc}{$self+0} = $self;
		573	$self->{root}->update;
		574	} else {
		575	delete $self->{req_w};
		576	delete $self->{req_h};
		577	}
418	}	578	}
419		579
420	sub update {	580	sub update {
421	my ($self) = @_;	581	my ($self) = @_;
422		582
423	$self->{parent}->update	583	$self->{parent}->update
424	if $self->{parent};	584	if $self->{parent};
425	}	585	}
426		586
427	sub connect {	587	sub reconfigure {
428	my ($self, $signal, $cb) = @_;	588	my ($self) = @_;
429		589
430	push @{ $self->{signal_cb}{$signal} }, $cb;	590	$self->realloc;
		591	$self->update;
431	}	592	}
432		593
433	sub emit {	594	# using global variables seems a bit hacky, but passing through all drawing
434	my ($self, $signal, @args) = @_;	595	# functions seems pointless.
		596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
435		597
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	598	#sub draw {
		599	#CFPlus.xs
		600
		601	sub _draw {
		602	my ($self) = @_;
		603
		604	warn "no draw defined for $self\n";
437	}	605	}
438		606
439	sub DESTROY {	607	sub DESTROY {
440	my ($self) = @_;	608	my ($self) = @_;
441		609
		610	return if CFPlus::in_destruct;
		611
		612	local $@;
		613	eval { $self->destroy };
		614	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		615
442	delete $WIDGET{$self+0};	616	delete $WIDGET{$self+0};
443	#$self->deactivate;
444	}	617	}
445		618
446	#############################################################################	619	#############################################################################
447		620
448	package CFClient::UI::DrawBG;	621	package CFPlus::UI::DrawBG;
449		622
450	our @ISA = CFClient::UI::Base::;	623	our @ISA = CFPlus::UI::Base::;
451		624
452	use strict;	625	use strict;
453	use CFClient::OpenGL;	626	use CFPlus::OpenGL;
454		627
455	sub new {	628	sub new {
456	my $class = shift;	629	my $class = shift;
457		630
458	# range [value, low, high, page]
459
460	$class->SUPER::new (	631	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
463	@_	634	@_
464	)	635	)
465	}	636	}
466		637
467	sub _draw {	638	sub _draw {
468	my ($self) = @_;	639	my ($self) = @_;
469		640
		641	my $color = $FOCUS == $self && $self->{active_bg}
		642	? $self->{active_bg}
		643	: $self->{bg};
		644
		645	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
471		647
472	glEnable GL_BLEND;	648	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	650	glColor_premultiply @$color;
475		651	glRect 0, 0, $w, $h;
476	glBegin GL_QUADS;
477	glVertex 0 , 0;
478	glVertex 0 , $h;
479	glVertex $w, $h;
480	glVertex $w, 0;
481	glEnd;
482
483	glDisable GL_BLEND;	652	glDisable GL_BLEND;
		653	}
484	}	654	}
485		655
486	#############################################################################	656	#############################################################################
487		657
488	package CFClient::UI::Empty;	658	package CFPlus::UI::Empty;
489		659
490	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
491		661
492	sub new {	662	sub new {
493	my ($class, %arg) = @_;	663	my ($class, %arg) = @_;
494	$class->SUPER::new (can_events => 0, %arg);	664	$class->SUPER::new (can_events => 0, %arg);
495	}	665	}
496		666
497	sub size_request {	667	sub size_request {
498	(0, 0)	668	my ($self) = @_;
		669
		670	($self->{w} + 0, $self->{h} + 0)
499	}	671	}
500		672
501	sub draw { }	673	sub draw { }
502		674
503	#############################################################################	675	#############################################################################
504		676
505	package CFClient::UI::Container;	677	package CFPlus::UI::Container;
506		678
507	our @ISA = CFClient::UI::Base::;	679	our @ISA = CFPlus::UI::Base::;
508		680
509	sub new {	681	sub new {
510	my ($class, %arg) = @_;	682	my ($class, %arg) = @_;
511		683
512	my $children = delete $arg{children} || [];	684	my $children = delete $arg{children};
513		685
514	my $self = $class->SUPER::new (	686	my $self = $class->SUPER::new (
515	children => [],	687	children => [],
516	can_events => 0,	688	can_events => 0,
517	%arg,	689	%arg,
518	);	690	);
		691
519	$self->add ($_) for @$children;	692	$self->add (@$children)
		693	if $children && @$children;
520		694
521	$self	695	$self
		696	}
		697
		698	sub realloc {
		699	my ($self) = @_;
		700
		701	$self->{force_realloc} = 1;
		702	$self->{force_size_alloc} = 1;
		703	$self->SUPER::realloc;
522	}	704	}
523		705
524	sub add {	706	sub add {
525	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
526		708
527	$_->set_parent ($self)	709	$_->set_parent ($self)
528	for @widgets;	710	for @widgets;
529		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
530	use sort 'stable';	713	use sort 'stable';
531		714
532	$self->{children} = [	715	$self->{children} = [
533	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
534	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
535	];	718	];
536		719
537	$self->check_size (1);	720	$self->realloc;
538	$self->update;	721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
539	}	725	}
540		726
541	sub children {	727	sub children {
542	@{ $_[0]{children} }	728	@{ $_[0]{children} }
543	}	729	}
544		730
545	sub remove {	731	sub remove {
546	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
547		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
548	delete $child->{parent};	737	delete $child->{parent};
549	$child->hide;	738	$child->hide;
550
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
552		741
553	$self->check_size;	742	$self->realloc;
554	$self->update;
555	}	743	}
556		744
557	sub clear {	745	sub clear {
558	my ($self) = @_;	746	my ($self) = @_;
559		747
560	my $children = delete $self->{children};	748	my $children = $self->{children};
561	$self->{children} = [];	749	$self->{children} = [];
562		750
563	for (@$children) {	751	for (@$children) {
564	delete $_->{parent};	752	delete $_->{parent};
565	$_->hide;	753	$_->hide;
566	}	754	}
567		755
568	$self->check_size;	756	$self->realloc;
569	$self->update;
570	}	757	}
571		758
572	sub find_widget {	759	sub find_widget {
573	my ($self, $x, $y) = @_;	760	my ($self, $x, $y) = @_;
574		761
575	$x -= $self->{x};	762	$x -= $self->{x};
576	$y -= $self->{y};	763	$y -= $self->{y};
577		764
578	my $res;	765	my $res;
579		766
580	for (reverse @{ $self->{children} }) {	767	for (reverse $self->visible_children) {
581	$res = $_->find_widget ($x, $y)	768	$res = $_->find_widget ($x, $y)
582	and return $res;	769	and return $res;
583	}	770	}
584		771
585	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	772	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
586	}	773	}
587		774
588	sub _draw {	775	sub _draw {
589	my ($self) = @_;	776	my ($self) = @_;
590		777
591	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
592	}	779	}
593		780
594	#############################################################################	781	#############################################################################
595		782
596	package CFClient::UI::Bin;	783	package CFPlus::UI::Bin;
597		784
598	our @ISA = CFClient::UI::Container::;	785	our @ISA = CFPlus::UI::Container::;
599		786
600	sub new {	787	sub new {
601	my ($class, %arg) = @_;	788	my ($class, %arg) = @_;
602		789
603	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	790	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
604		791
605	$class->SUPER::new (children => [$child], %arg)	792	$class->SUPER::new (children => [$child], %arg)
606	}	793	}
607		794
608	sub add {	795	sub add {
609	my ($self, $child) = @_;	796	my ($self, $child) = @_;
610		797
611	$self->{children} = [];	798	$self->clear;
612
613	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
614	}	800	}
615		801
616	sub remove {	802	sub remove {
617	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
618		804
619	$self->SUPER::remove ($widget);	805	$self->SUPER::remove ($widget);
620		806
621	$self->{children} = [new CFClient::UI::Empty]	807	$self->{children} = [new CFPlus::UI::Empty]
622	unless @{$self->{children}};	808	unless @{$self->{children}};
623	}	809	}
624		810
625	sub child { $_[0]->{children}[0] }	811	sub child { $_[0]->{children}[0] }
626		812
627	sub size_request {	813	sub size_request {
628	$_[0]{children}[0]->size_request	814	$_[0]{children}[0]->size_request
629	}	815	}
630		816
631	sub size_allocate {	817	sub invoke_size_allocate {
632	my ($self, $w, $h) = @_;	818	my ($self, $w, $h) = @_;
633		819
634	$self->{children}[0]->configure (0, 0, $w, $h);	820	$self->{children}[0]->configure (0, 0, $w, $h);
		821
		822	1
635	}	823	}
636		824
637	#############################################################################	825	#############################################################################
638		826
		827	# back-buffered drawing area
		828
639	package CFClient::UI::Window;	829	package CFPlus::UI::Window;
640		830
641	our @ISA = CFClient::UI::Bin::;	831	our @ISA = CFPlus::UI::Bin::;
642		832
643	use CFClient::OpenGL;	833	use CFPlus::OpenGL;
644		834
645	sub new {	835	sub new {
646	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
647		837
648	my $self = $class->SUPER::new (%arg);	838	my $self = $class->SUPER::new (%arg);
…		…
653		843
654	$ROOT->on_post_alloc ($self => sub { $self->render_child });	844	$ROOT->on_post_alloc ($self => sub { $self->render_child });
655	$self->SUPER::update;	845	$self->SUPER::update;
656	}	846	}
657		847
658	sub size_allocate {	848	sub invoke_size_allocate {
659	my ($self, $w, $h) = @_;	849	my ($self, $w, $h) = @_;
660		850
661	$self->SUPER::size_allocate ($w, $h);
662	$self->update;	851	$self->update;
		852
		853	$self->SUPER::invoke_size_allocate ($w, $h)
663	}	854	}
664		855
665	sub _render {	856	sub _render {
		857	my ($self) = @_;
		858
666	$_[0]{children}[0]->draw;	859	$self->{children}[0]->draw;
667	}	860	}
668		861
669	sub render_child {	862	sub render_child {
670	my ($self) = @_;	863	my ($self) = @_;
671		864
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	865	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	866	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	867	glClear GL_COLOR_BUFFER_BIT;
675		868
		869	{
		870	package CFPlus::UI::Base;
		871
		872	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		873	(0, 0, $self->{w}, $self->{h});
		874
676	$self->_render;	875	$self->_render;
677	# glColorMask 1, 1, 1, 0;	876	}
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	877	};
685	}	878	}
686		879
687	sub _draw {	880	sub _draw {
688	my ($self) = @_;	881	my ($self) = @_;
689
690	my ($w, $h) = ($self->w, $self->h);
691		882
692	my $tex = $self->{texture}	883	my $tex = $self->{texture}
693	or return;	884	or return;
694		885
695	glEnable GL_TEXTURE_2D;	886	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	888	glColor 0, 0, 0, 1;
698		889
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	890	$tex->draw_quad_alpha_premultiplied (0, 0);
700		891
701	glDisable GL_TEXTURE_2D;	892	glDisable GL_TEXTURE_2D;
702	}	893	}
703		894
704	#############################################################################	895	#############################################################################
705		896
706	package CFClient::UI::ViewPort;	897	package CFPlus::UI::ViewPort;
707		898
		899	use List::Util qw(min max);
		900
708	our @ISA = CFClient::UI::Window::;	901	our @ISA = CFPlus::UI::Window::;
		902
		903	sub new {
		904	my $class = shift;
		905
		906	$class->SUPER::new (
		907	scroll_x => 0,
		908	scroll_y => 1,
		909	@_,
		910	)
		911	}
709		912
710	sub size_request {	913	sub size_request {
711	my ($self) = @_;	914	my ($self) = @_;
712		915
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		917
716	@$self{qw(child_w child_h)}	918	$w = 1 if $self->{scroll_x};
717	}	919	$h = 1 if $self->{scroll_y};
718		920
		921	($w, $h)
		922	}
		923
719	sub size_allocate {	924	sub invoke_size_allocate {
720	my ($self, $w, $h) = @_;	925	my ($self, $w, $h) = @_;
721		926
		927	my $child = $self->child;
		928
		929	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		930	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		931
		932	$self->child->configure (0, 0, $w, $h);
722	$self->update;	933	$self->update;
		934
		935	1
723	}	936	}
724		937
725	sub set_offset {	938	sub set_offset {
726	my ($self, $x, $y) = @_;	939	my ($self, $x, $y) = @_;
727		940
		941	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		942	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		943
		944	if ($x != $self->{view_x} or $y != $self->{view_y}) {
728	$self->{view_x} = int $x;	945	$self->{view_x} = $x;
729	$self->{view_y} = int $y;	946	$self->{view_y} = $y;
730		947
		948	$self->emit (changed => $x, $y);
731	$self->update;	949	$self->update;
		950	}
		951	}
		952
		953	sub set_center {
		954	my ($self, $x, $y) = @_;
		955
		956	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		957	}
		958
		959	sub make_visible {
		960	my ($self, $x, $y, $border) = @_;
		961
		962	if ( $x < $self->{view_x} + $self->{w} * $border
		963	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		964	|| $y < $self->{view_y} + $self->{h} * $border
		965	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		966	) {
		967	$self->set_center ($x, $y);
		968	}
732	}	969	}
733		970
734	# hmm, this does not work for topleft of $self... but we should not ask for that	971	# hmm, this does not work for topleft of $self... but we should not ask for that
735	sub coord2local {	972	sub coord2local {
736	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
…		…
751	my ($self, $x, $y) = @_;	988	my ($self, $x, $y) = @_;
752		989
753	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	990	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
754	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	991	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
755	) {	992	) {
756	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	993	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
757	} else {	994	} else {
758	$self->CFClient::UI::Base::find_widget ($x, $y)	995	$self->CFPlus::UI::Base::find_widget ($x, $y)
759	}	996	}
760	}	997	}
761		998
762	sub _render {	999	sub _render {
763	my ($self) = @_;	1000	my ($self) = @_;
764		1001
		1002	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1003	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1004
765	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1005	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766		1006
767	$self->SUPER::_render;	1007	$self->SUPER::_render;
768	}	1008	}
769		1009
770	#############################################################################	1010	#############################################################################
771		1011
772	package CFClient::UI::ScrolledWindow;	1012	package CFPlus::UI::ScrolledWindow;
773		1013
774	our @ISA = CFClient::UI::HBox::;	1014	our @ISA = CFPlus::UI::Table::;
775		1015
776	sub new {	1016	sub new {
777	my $class = shift;	1017	my ($class, %arg) = @_;
		1018
		1019	my $child = delete $arg{child};
778		1020
779	my $self;	1021	my $self;
780		1022
781	my $slider = new CFClient::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
782	vertical => 1,	1026	vertical => 0,
783	range => [0, 0, 1, 0.01], # HACK fix	1027	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	1028	on_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	1029	$self->{hpos} = $_[1];
		1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
786	},	1031	},
787	;	1032	;
788		1033
		1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
		1037	vertical => 1,
		1038	range => [0, 0, 1, 0.01], # HACK fix
		1039	on_changed => sub {
		1040	$self->{vpos} = $_[1];
		1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1042	},
		1043	;
		1044
789	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	1046	scroll_x => 0,
		1047	scroll_y => 1,
		1048	can_events => 1,
791	slider => $slider,	1049	hslider => $hslider,
792	@_,	1050	vslider => $vslider,
		1051	col_expand => [1, 0],
		1052	row_expand => [1, 0],
		1053	%arg,
793	);	1054	);
794		1055
795	$self->{vp}->add ($self->{scrolled});	1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
		1059	expand => 1,
		1060	scroll_x => $self->{scroll_x},
		1061	scroll_y => $self->{scroll_y},
		1062	on_changed => sub {
		1063	my ($vp, $x, $y) = @_;
		1064
		1065	$vp->{parent}{hslider}->set_value ($x);
		1066	$vp->{parent}{vslider}->set_value ($y);
		1067
		1068	0
		1069	},
		1070	on_size_allocate => sub {
		1071	my ($vp, $w, $h) = @_;
		1072	$vp->{parent}->update_slider;
		1073	0
		1074	},
		1075	;
		1076
796	$self->add ($self->{vp});	1077	$self->SUPER::add ($self->{vp});
797	$self->add ($self->{slider});	1078
		1079	$self->add ($child) if $child;
798		1080
799	$self	1081	$self
800	}	1082	}
801		1083
802	#TODO# update range on size_allocate depending on child	1084	sub add {
803	# update viewport offset on scroll	1085	my ($self, $widget) = @_;
		1086
		1087	$self->{vp}->add ($self->{child} = $widget);
		1088	}
		1089
		1090	sub set_offset { shift->{vp}->set_offset (@_) }
		1091	sub set_center { shift->{vp}->set_center (@_) }
		1092	sub make_visible { shift->{vp}->make_visible (@_) }
		1093
		1094	sub update_slider {
		1095	my ($self) = @_;
		1096
		1097	my $child = ($self->{vp} or return)->child;
		1098
		1099	if ($self->{scroll_x}) {
		1100	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1101	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1102
		1103	my $visible = $w1 > $w2;
		1104	if ($visible != $self->{hslider_visible}) {
		1105	$self->{hslider_visible} = $visible;
		1106	$visible ? $self->SUPER::add ($self->{hslider})
		1107	: $self->SUPER::remove ($self->{hslider});
		1108	}
		1109	}
		1110
		1111	if ($self->{scroll_y}) {
		1112	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1113	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1114
		1115	my $visible = $h1 > $h2;
		1116	if ($visible != $self->{vslider_visible}) {
		1117	$self->{vslider_visible} = $visible;
		1118	$visible ? $self->SUPER::add ($self->{vslider})
		1119	: $self->SUPER::remove ($self->{vslider});
		1120	}
		1121	}
		1122	}
		1123
		1124	sub start_dragging {
		1125	my ($self, $ev) = @_;
		1126
		1127	$self->grab_focus;
		1128
		1129	my $ox = $self->{vp}{view_x};
		1130	my $oy = $self->{vp}{view_y};
		1131
		1132	$self->{motion} = sub {
		1133	my ($ev, $x, $y) = @_;
		1134
		1135	$ox -= $ev->{xrel};
		1136	$oy -= $ev->{yrel};
		1137
		1138	$self->{vp}->set_offset ($ox, $oy);
		1139	};
		1140	}
		1141
		1142	sub invoke_mouse_wheel {
		1143	my ($self, $ev) = @_;
		1144
		1145	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1146	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
		1158
		1159	0
		1160	}
		1161
		1162	sub invoke_button_up {
		1163	my ($self, $ev, $x, $y) = @_;
		1164
		1165	if (delete $self->{motion}) {
		1166	return 1;
		1167	}
		1168
		1169	0
		1170	}
		1171
		1172	sub invoke_mouse_motion {
		1173	my ($self, $ev, $x, $y) = @_;
		1174
		1175	if ($self->{motion}) {
		1176	$self->{motion}->($ev, $x, $y);
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_size_allocate {
		1184	my ($self, $w, $h) = @_;
		1185
		1186	$self->update_slider;
		1187	$self->SUPER::invoke_size_allocate ($w, $h)
		1188	}
804		1189
805	#############################################################################	1190	#############################################################################
806		1191
807	package CFClient::UI::Frame;	1192	package CFPlus::UI::Frame;
808		1193
809	our @ISA = CFClient::UI::Bin::;	1194	our @ISA = CFPlus::UI::Bin::;
810		1195
811	use CFClient::OpenGL;	1196	use CFPlus::OpenGL;
812		1197
813	sub new {	1198	sub new {
814	my $class = shift;	1199	my $class = shift;
815		1200
816	$class->SUPER::new (	1201	$class->SUPER::new (
…		…
824		1209
825	if ($self->{bg}) {	1210	if ($self->{bg}) {
826	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
827		1212
828	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
829	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
830	glColor @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
831
832	glBegin GL_QUADS;
833	glVertex 0 , 0;
834	glVertex 0 , $h;
835	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
836	glVertex $w, 0;
837	glEnd;
838
839	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
840	}	1218	}
841		1219
842	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
843	}	1221	}
844		1222
845	#############################################################################	1223	#############################################################################
846		1224
847	package CFClient::UI::FancyFrame;	1225	package CFPlus::UI::FancyFrame;
848		1226
849	our @ISA = CFClient::UI::Bin::;	1227	our @ISA = CFPlus::UI::Bin::;
850		1228
851	use CFClient::OpenGL;	1229	use CFPlus::OpenGL;
852
853	my @tex =
854	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856		1230
857	sub new {	1231	sub new {
858	my $class = shift;	1232	my ($class, %arg) = @_;
859		1233
860	# TODO: user_x, user_y, overwrite moveto?	1234	if ((exists $arg{label}) && !ref $arg{label}) {
		1235	$arg{label} = new CFPlus::UI::Label
		1236	align => 1,
		1237	valign => 0,
		1238	text => $arg{label},
		1239	fontsize => ($arg{border} || 0.8) * 0.75;
		1240	}
861		1241
862	my $self = $class->SUPER::new (	1242	my $self = $class->SUPER::new (
		1243	# label => "",
863	bg => [1, 1, 1, 1],	1244	fg => [0.6, 0.3, 0.1],
864	border_bg => [1, 1, 1, 1],
865	border => 0.6,	1245	border => 0.8,
866	toplevel => 1,	1246	style => 'single',
867	can_events => 1,	1247	%arg,
868	@_
869	);	1248	);
870		1249
871	$self->{title} &&= new CFClient::UI::Label
872	align => 0,
873	valign => 1,
874	text => $self->{title},
875	fontsize => $self->{border};
876
877	$self	1250	$self
		1251	}
		1252
		1253	sub add {
		1254	my ($self, @widgets) = @_;
		1255
		1256	$self->SUPER::add (@widgets);
		1257	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
878	}	1258	}
879		1259
880	sub border {	1260	sub border {
881	int $_[0]{border} * $::FONTSIZE	1261	int $_[0]{border} * $::FONTSIZE
882	}	1262	}
883		1263
884	sub size_request {	1264	sub size_request {
885	my ($self) = @_;	1265	my ($self) = @_;
		1266
		1267	($self->{label_w}, undef) = $self->{label}->size_request
		1268	if $self->{label};
886		1269
887	my ($w, $h) = $self->SUPER::size_request;	1270	my ($w, $h) = $self->SUPER::size_request;
888		1271
889	(	1272	(
890	$w + $self->border * 2,	1273	$w + $self->border * 2,
891	$h + $self->border * 2,	1274	$h + $self->border * 2,
892	)	1275	)
893	}	1276	}
894		1277
895	sub size_allocate {	1278	sub invoke_size_allocate {
896	my ($self, $w, $h) = @_;	1279	my ($self, $w, $h) = @_;
897		1280
898	$h -= List::Util::max 0, $self->border * 2;	1281	my $border = $self->border;
		1282
899	$w -= List::Util::max 0, $self->border * 2;	1283	$w -= List::Util::max 0, $border * 2;
		1284	$h -= List::Util::max 0, $border * 2;
900		1285
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1286	if (my $label = $self->{label}) {
902	if $self->{title};	1287	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1288	$label->{h} = List::Util::min $h, $border;
		1289	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1290	}
903		1291
904	$self->child->configure ($self->border, $self->border, $w, $h);	1292	$self->child->configure ($border, $border, $w, $h);
905	}
906		1293
		1294	1
		1295	}
		1296
		1297	sub _draw {
		1298	my ($self) = @_;
		1299
		1300	my $child = $self->{children}[0];
		1301
		1302	my $border = $self->border;
		1303	my ($w, $h) = ($self->{w}, $self->{h});
		1304
		1305	$child->draw;
		1306
		1307	glColor @{$self->{fg}};
		1308	glBegin GL_LINE_STRIP;
		1309	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1310	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1311	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1312	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1313	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1314	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1315	glEnd;
		1316
		1317	if ($self->{label}) {
		1318	glTranslate $border * 2, 0;
		1319	$self->{label}->_draw;
		1320	}
		1321	}
		1322
		1323	#############################################################################
		1324
		1325	package CFPlus::UI::Toplevel;
		1326
		1327	our @ISA = CFPlus::UI::Bin::;
		1328
		1329	use CFPlus::OpenGL;
		1330
		1331	my $bg =
		1332	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1333	mipmap => 1, wrap => 1;
		1334
		1335	my @border =
		1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1337	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1338
		1339	my @icon =
		1340	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1341	qw(x1_move.png x1_resize.png);
		1342
		1343	sub new {
		1344	my ($class, %arg) = @_;
		1345
		1346	my $self = $class->SUPER::new (
		1347	bg => [1, 1, 1, 1],
		1348	border_bg => [1, 1, 1, 1],
		1349	border => 0.6,
		1350	can_events => 1,
		1351	min_w => 64,
		1352	min_h => 32,
		1353	%arg,
		1354	);
		1355
		1356	$self->{title_widget} = new CFPlus::UI::Label
		1357	align => 0,
		1358	valign => 1,
		1359	text => $self->{title},
		1360	fontsize => $self->{border},
		1361	if exists $self->{title};
		1362
		1363	if ($self->{has_close_button}) {
		1364	$self->{close_button} =
		1365	new CFPlus::UI::ImageButton
		1366	path => 'x1_close.png',
		1367	on_activate => sub { $self->emit ("delete") };
		1368
		1369	$self->CFPlus::UI::Container::add ($self->{close_button});
		1370	}
		1371
		1372	$self
		1373	}
		1374
		1375	sub add {
		1376	my ($self, @widgets) = @_;
		1377
		1378	$self->SUPER::add (@widgets);
		1379	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1380	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
		1381	}
		1382
		1383	sub border {
		1384	int $_[0]{border} * $::FONTSIZE
		1385	}
		1386
		1387	sub size_request {
		1388	my ($self) = @_;
		1389
		1390	$self->{title_widget}->size_request
		1391	if $self->{title_widget};
		1392
		1393	$self->{close_button}->size_request
		1394	if $self->{close_button};
		1395
		1396	my ($w, $h) = $self->SUPER::size_request;
		1397
		1398	(
		1399	$w + $self->border * 2,
		1400	$h + $self->border * 2,
		1401	)
		1402	}
		1403
		1404	sub invoke_size_allocate {
		1405	my ($self, $w, $h) = @_;
		1406
		1407	if ($self->{title_widget}) {
		1408	$self->{title_widget}{w} = $w;
		1409	$self->{title_widget}{h} = $h;
		1410	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1411	}
		1412
		1413	my $border = $self->border;
		1414
		1415	$h -= List::Util::max 0, $border * 2;
		1416	$w -= List::Util::max 0, $border * 2;
		1417
		1418	$self->child->configure ($border, $border, $w, $h);
		1419
		1420	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1421	if $self->{close_button};
		1422
		1423	1
		1424	}
		1425
		1426	sub invoke_delete {
		1427	my ($self) = @_;
		1428
		1429	$self->hide;
		1430
		1431	1
		1432	}
		1433
907	sub button_down {	1434	sub invoke_button_down {
908	my ($self, $ev, $x, $y) = @_;	1435	my ($self, $ev, $x, $y) = @_;
909		1436
910	my ($w, $h) = @$self{qw(w h)};	1437	my ($w, $h) = @$self{qw(w h)};
911	my $border = $self->border;	1438	my $border = $self->border;
912		1439
…		…
925	my ($ev, $x, $y) = @_;	1452	my ($ev, $x, $y) = @_;
926		1453
927	my $dx = $ev->{x} - $ox;	1454	my $dx = $ev->{x} - $ox;
928	my $dy = $ev->{y} - $oy;	1455	my $dy = $ev->{y} - $oy;
929		1456
930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1457	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1458	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1459
932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1460	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933	$self->check_size;	1461	$self->realloc;
934	};	1462	};
935		1463
936	} elsif ($lr ^ $td) {	1464	} elsif ($lr ^ $td) {
937	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1465	my ($ox, $oy) = ($ev->{x}, $ev->{y});
938	my ($bx, $by) = ($self->{x}, $self->{y});	1466	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
940	$self->{motion} = sub {	1468	$self->{motion} = sub {
941	my ($ev, $x, $y) = @_;	1469	my ($ev, $x, $y) = @_;
942		1470
943	($x, $y) = ($ev->{x}, $ev->{y});	1471	($x, $y) = ($ev->{x}, $ev->{y});
944		1472
945	$self->move ($bx + $x - $ox, $by + $y - $oy);	1473	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946	$self->update;	1474	# HACK: the next line is required to enforce placement
		1475	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
947	};	1476	};
		1477	} else {
		1478	return 0;
		1479	}
		1480
948	}	1481	1
949	}	1482	}
950		1483
951	sub button_up {	1484	sub invoke_button_up {
952	my ($self, $ev, $x, $y) = @_;	1485	my ($self, $ev, $x, $y) = @_;
953		1486
954	delete $self->{motion};	1487	! ! delete $self->{motion}
955	}	1488	}
956		1489
957	sub mouse_motion {	1490	sub invoke_mouse_motion {
958	my ($self, $ev, $x, $y) = @_;	1491	my ($self, $ev, $x, $y) = @_;
959		1492
960	$self->{motion}->($ev, $x, $y) if $self->{motion};	1493	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1494
		1495	! ! $self->{motion}
		1496	}
		1497
		1498	sub invoke_visibility_change {
		1499	my ($self, $visible) = @_;
		1500
		1501	delete $self->{motion} unless $visible;
		1502
		1503	0
961	}	1504	}
962		1505
963	sub _draw {	1506	sub _draw {
964	my ($self) = @_;	1507	my ($self) = @_;
965		1508
		1509	my $child = $self->{children}[0];
		1510
966	my ($w, $h ) = ($self->{w}, $self->{h});	1511	my ($w, $h ) = ($self->{w}, $self->{h});
967	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1512	my ($cw, $ch) = ($child->{w}, $child->{h});
968		1513
969	glEnable GL_TEXTURE_2D;	1514	glEnable GL_TEXTURE_2D;
970	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971		1516
972	my $border = $self->border;	1517	my $border = $self->border;
973		1518
974	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
975	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
976	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
977	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1523	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1524
		1525	# move
		1526	my $w2 = ($w - $border) * .5;
		1527	my $h2 = ($h - $border) * .5;
		1528	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1529	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1530	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1531
		1532	# resize
		1533	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1534	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1535	unless $self->{has_close_button};
		1536	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1537	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
979		1538
980	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981	my $bg = $tex[0];	1540	glColor @{ $self->{bg} };
982		1541
983	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
		1543	# solve this better(?)
984	my $rep_x = $cw / $bg->{w};	1544	$bg->{s} = $cw / $bg->{w};
985	my $rep_y = $ch / $bg->{h};	1545	$bg->{t} = $ch / $bg->{h};
986
987	glColor @{ $self->{bg} };
988
989	$bg->{s} = $rep_x;
990	$bg->{t} = $rep_y;
991	$bg->{wrap_mode} = 1;
992	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1546	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
993	}	1547	}
994		1548
995	glDisable GL_TEXTURE_2D;	1549	glDisable GL_TEXTURE_2D;
996		1550
997	$self->{title}->draw if $self->{title};
998
999	$self->child->draw;	1551	$child->draw;
		1552
		1553	if ($self->{title_widget}) {
		1554	glTranslate 0, $border - $self->{h};
		1555	$self->{title_widget}->_draw;
		1556
		1557	glTranslate 0, - ($border - $self->{h});
		1558	}
		1559
		1560	$self->{close_button}->draw
		1561	if $self->{close_button};
1000	}	1562	}
1001		1563
1002	#############################################################################	1564	#############################################################################
1003		1565
1004	package CFClient::UI::Table;	1566	package CFPlus::UI::Table;
1005		1567
1006	our @ISA = CFClient::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1007		1569
1008	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1009		1571
1010	use CFClient::OpenGL;	1572	use CFPlus::OpenGL;
1011		1573
1012	sub new {	1574	sub new {
1013	my $class = shift;	1575	my $class = shift;
1014		1576
1015	$class->SUPER::new (	1577	$class->SUPER::new (
1016	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1017	@_	1580	@_,
1018	)	1581	)
1019	}	1582	}
1020		1583
1021	sub add {	1584	sub add {
1022	my ($self, $x, $y, $child) = @_;
1023
1024	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;
1026
1027	$child->check_size;
1028	}
1029
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?
1035	sub clear {
1036	my ($self) = @_;	1585	my ($self, @widgets) = @_;
		1586
		1587	for my $child (@widgets) {
		1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
		1591
		1592	$self->SUPER::add (@widgets);
		1593	}
		1594
		1595	sub add_at {
		1596	my $self = shift;
		1597
		1598	my @widgets;
		1599
		1600	while (@_) {
		1601	my ($col, $row, $child) = splice @_, 0, 3, ();
		1602
		1603	$child->{c_row} = $row;
		1604	$child->{c_col} = $col;
		1605
		1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
		1613	my ($self) = @_;
		1614
		1615	my (@w, @h);
1037		1616
1038	my @children = $self->children;	1617	my @children = $self->children;
1039	delete $self->{children};	1618
		1619	# first pass, columns
		1620	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1621	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1622
		1623	my $sw = sum @w[$c .. $c + $cs - 1];
		1624
		1625	if ($w > $sw) {
		1626	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1627	}
1040		1628	}
1041	for (@children) {
1042	delete $_->{parent};
1043	$_->hide;
1044	}
1045		1629
1046	$self->update;	1630	# second pass, rows
1047	}	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1048
1049	sub get_wh {
1050	my ($self) = @_;
1051
1052	my (@w, @h);
1053
1054	for my $y (0 .. $#{$self->{children}}) {
1055	my $row = $self->{children}[$y]
1056	or next;
1057
1058	for my $x (0 .. $#$row) {
1059	my $widget = $row->[$x]
1060	or next;
1061	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1062		1633
1063	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1064	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1065	}	1638	}
1066	}	1639	}
1067		1640
1068	(\@w, \@h)	1641	(\@w, \@h)
1069	}	1642	}
…		…
1077	(sum @$ws),	1650	(sum @$ws),
1078	(sum @$hs),	1651	(sum @$hs),
1079	)	1652	)
1080	}	1653	}
1081		1654
1082	sub size_allocate {	1655	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1656	my ($self, $w, $h) = @_;
1084		1657
1085	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1086		1659
1087	my $req_w = sum @$ws;	1660	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1661	my $req_h = (sum @$hs) || 1;
1089		1662
1090	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1091	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1094		1667
1095	# linearly scale sizes
1096	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1097	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1098		1669
1099	CFClient::UI::harmonize $ws;	1670	CFPlus::UI::harmonize $ws;
		1671
		1672	my @row_expand = @{$self->{row_expand}};
		1673	@row_expand = (1) x @$ws unless @row_expand;
		1674	my $row_expand = (sum @row_expand) || 1;
		1675
		1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1677
1100	CFClient::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1101		1679
1102	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1103		1682
1104	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1105	my $row = $self->{children}[$r]	1684	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1106	or next;
1107		1685
1108	my $x = 0;	1686	$widget->configure (
1109	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1110		1689	);
1111	for my $c (0 .. $#$row) {	1690	}
1112	my $col_w = $ws->[$c];
1113		1691
1114	if (my $widget = $row->[$c]) {	1692	1
1115	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1116	}
1117		1694
1118	$x += $col_w;	1695	#############################################################################
		1696
		1697	package CFPlus::UI::Fixed;
		1698
		1699	use List::Util qw(min max);
		1700
		1701	our @ISA = CFPlus::UI::Container::;
		1702
		1703	sub _scale($$$) {
		1704	my ($rel, $val, $max) = @_;
		1705
		1706	$rel ? $val * $max : $val
		1707	}
		1708
		1709	sub size_request {
		1710	my ($self) = @_;
		1711
		1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1713
		1714	# determine overall size by querying abs widgets
		1715	for my $child ($self->visible_children) {
		1716	unless ($child->{c_rel}) {
		1717	my $x = $child->{c_x};
		1718	my $y = $child->{c_y};
		1719
		1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1119	}	1722	}
1120
1121	$y += $row_h;
1122	}	1723	}
1123		1724
1124	}	1725	my $W = $x2 - $x1;
		1726	my $H = $y2 - $y1;
1125		1727
1126	sub find_widget {	1728	# now layout remaining widgets
		1729	for my $child ($self->visible_children) {
		1730	if ($child->{c_rel}) {
		1731	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1732	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
1127	my ($self, $x, $y) = @_;	1746	my ($self, $W, $H) = @_;
1128		1747
1129	$x -= $self->{x};	1748	for my $child ($self->visible_children) {
1130	$y -= $self->{y};	1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1131		1751
1132	my $res;	1752	$x += $child->{c_halign} * $child->{req_w};
		1753	$y += $child->{c_valign} * $child->{req_h};
1133		1754
1134	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1135	$res = $_->find_widget ($x, $y)	1756	}
1136	and return $res;	1757
1137	}	1758	1
1138
1139	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1140	}
1141
1142	sub _draw {
1143	my ($self) = @_;
1144
1145	for (grep $_, @{$self->{children}}) {
1146	$_->draw for grep $_, @$_;
1147	}
1148	}	1759	}
1149		1760
1150	#############################################################################	1761	#############################################################################
1151		1762
1152	package CFClient::UI::HBox;	1763	package CFPlus::UI::Box;
1153		1764
1154	# TODO: wrap into common Box base class
1155
1156	our @ISA = CFClient::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1157		1766
1158	sub size_request {	1767	sub size_request {
1159	my ($self) = @_;	1768	my ($self) = @_;
1160		1769
1161	my @alloc = map [$_->size_request], @{$self->{children}};	1770	my @children = $self->visible_children;
1162		1771
		1772	$self->{vertical}
		1773	? (
		1774	(List::Util::max map $_->{req_w}, @children),
		1775	(List::Util::sum map $_->{req_h}, @children),
		1776	)
		1777	: (
		1778	(List::Util::sum map $_->{req_w}, @children),
		1779	(List::Util::max map $_->{req_h}, @children),
		1780	)
		1781	}
		1782
		1783	sub invoke_size_allocate {
		1784	my ($self, $w, $h) = @_;
		1785
		1786	my $space = $self->{vertical} ? $h : $w;
		1787	my @children = $self->visible_children;
		1788
		1789	my @req;
		1790
		1791	if ($self->{homogeneous}) {
		1792	@req = ($space / (@children || 1)) x @children;
		1793	} else {
		1794	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
		1795	my $req = List::Util::sum @req;
		1796
		1797	if ($req > $space) {
		1798	# ah well, not enough space
		1799	$_ *= $space / $req for @req;
		1800	} else {
		1801	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
		1802
		1803	$space = ($space - $req) / $expand; # remaining space to give away
		1804
		1805	$req[$_] += $space * $children[$_]{expand}
		1806	for 0 .. $#children;
		1807	}
1163	(	1808	}
1164	(List::Util::sum map $_->[0], @alloc),	1809
1165	(List::Util::max map $_->[1], @alloc),	1810	CFPlus::UI::harmonize \@req;
		1811
		1812	my $pos = 0;
		1813	for (0 .. $#children) {
		1814	my $alloc = $req[$_];
		1815	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1816
		1817	$pos += $alloc;
		1818	}
		1819
		1820	1
		1821	}
		1822
		1823	#############################################################################
		1824
		1825	package CFPlus::UI::HBox;
		1826
		1827	our @ISA = CFPlus::UI::Box::;
		1828
		1829	sub new {
		1830	my $class = shift;
		1831
		1832	$class->SUPER::new (
		1833	vertical => 0,
		1834	@_,
1166	)	1835	)
1167	}	1836	}
1168		1837
1169	sub size_allocate {
1170	my ($self, $w, $h) = @_;
1171
1172	($h, $w) = ($w, $h);
1173
1174	my $children = $self->{children};
1175
1176	my @h = map $_->{req_w}, @$children;
1177
1178	my $req_h = List::Util::sum @h;
1179
1180	if ($req_h > $h) {
1181	# ah well, not enough space
1182	$_ *= $h / $req_h for @h;
1183	} else {
1184	my $exp = List::Util::sum map $_->{expand}, @$children;
1185	$exp ||= 1;
1186
1187	for (0 .. $#$children) {
1188	my $child = $children->[$_];
1189
1190	my $alloc_h = $h[$_];
1191	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192	$h[$_] = $alloc_h;
1193	}
1194	}
1195
1196	CFClient::UI::harmonize \@h;
1197
1198	my $y = 0;
1199	for (0 .. $#$children) {
1200	my $child = $children->[$_];
1201	my $h = $h[$_];
1202	$child->configure ($y, 0, $h, $w);
1203
1204	$y += $h;
1205	}
1206
1207	1
1208	}
1209
1210	#############################################################################	1838	#############################################################################
1211		1839
1212	package CFClient::UI::VBox;	1840	package CFPlus::UI::VBox;
1213		1841
1214	# TODO: wrap into common Box base class	1842	our @ISA = CFPlus::UI::Box::;
1215		1843
1216	our @ISA = CFClient::UI::Container::;	1844	sub new {
		1845	my $class = shift;
1217		1846
1218	sub size_request {	1847	$class->SUPER::new (
1219	my ($self) = @_;	1848	vertical => 1,
1220		1849	@_,
1221	my @alloc = map [$_->size_request], @{$self->{children}};
1222
1223	(
1224	(List::Util::max map $_->[0], @alloc),
1225	(List::Util::sum map $_->[1], @alloc),
1226	)	1850	)
1227	}	1851	}
1228		1852
1229	sub size_allocate {
1230	my ($self, $w, $h) = @_;
1231
1232	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234	my $children = $self->{children};
1235
1236	my @h = map $_->{req_h}, @$children;
1237
1238	my $req_h = List::Util::sum @h;
1239
1240	if ($req_h > $h) {
1241	# ah well, not enough space
1242	$_ *= $h / $req_h for @h;
1243	} else {
1244	my $exp = List::Util::sum map $_->{expand}, @$children;
1245	$exp ||= 1;
1246
1247	for (0 .. $#$children) {
1248	my $child = $children->[$_];
1249
1250	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251	}
1252	}
1253
1254	CFClient::UI::harmonize \@h;
1255
1256	my $y = 0;
1257	for (0 .. $#$children) {
1258	my $child = $children->[$_];
1259	my $h = $h[$_];
1260	$child->configure (0, $y, $w, $h);
1261
1262	$y += $h;
1263	}
1264
1265	1
1266	}
1267
1268	#############################################################################	1853	#############################################################################
1269		1854
1270	package CFClient::UI::Label;	1855	package CFPlus::UI::Label;
1271		1856
1272	our @ISA = CFClient::UI::Base::;	1857	our @ISA = CFPlus::UI::DrawBG::;
1273		1858
1274	use CFClient::OpenGL;	1859	use CFPlus::OpenGL;
1275		1860
1276	sub new {	1861	sub new {
1277	my ($class, %arg) = @_;	1862	my ($class, %arg) = @_;
1278		1863
1279	my $self = $class->SUPER::new (	1864	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1865	fg => [1, 1, 1],
		1866	#bg => none
		1867	#active_bg => none
1281	#font => default_font	1868	#font => default_font
1282	#text => initial text	1869	#text => initial text
1283	#markup => initial narkup	1870	#markup => initial narkup
		1871	#max_w => maximum pixel width
		1872	#style => 0, # render flags
		1873	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1874	layout => (new CFPlus::Layout),
1285	fontsize => 1,	1875	fontsize => 1,
1286	align => -1,	1876	align => -1,
1287	valign => -1,	1877	valign => -1,
1288	padding => 2,	1878	padding_x => 2,
		1879	padding_y => 2,
1289	can_events => 0,	1880	can_events => 0,
1290	%arg	1881	%arg
1291	);	1882	);
1292		1883
1293	if (exists $self->{template}) {	1884	if (exists $self->{template}) {
1294	my $layout = new CFClient::Layout;	1885	my $layout = new CFPlus::Layout;
1295	$layout->set_text (delete $self->{template});	1886	$layout->set_text (delete $self->{template});
1296	$self->{template} = $layout;	1887	$self->{template} = $layout;
1297	}	1888	}
1298		1889
1299	if (exists $self->{markup}) {	1890	if (exists $self->{markup}) {
…		…
1303	}	1894	}
1304		1895
1305	$self	1896	$self
1306	}	1897	}
1307		1898
1308	sub escape {
1309	local $_ = $_[1];
1310
1311	s/&/&amp;/g;
1312	s/>/&gt;/g;
1313	s/</&lt;/g;
1314
1315	$_[1]
1316	}
1317
1318	sub update {	1899	sub update {
1319	my ($self) = @_;	1900	my ($self) = @_;
1320		1901
1321	delete $self->{texture};	1902	delete $self->{texture};
1322	$self->SUPER::update;	1903	$self->SUPER::update;
1323	}	1904	}
1324		1905
		1906	sub realloc {
		1907	my ($self) = @_;
		1908
		1909	delete $self->{ox};
		1910	$self->SUPER::realloc;
		1911	}
		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1325	sub set_text {	1919	sub set_text {
1326	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1327		1921
1328	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1329	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
1330		1924
1331	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332	$self->{layout}->set_text ($text);	1925	$self->{layout}->set_text ($text);
1333		1926
		1927	delete $self->{size_req};
		1928	$self->realloc;
1334	$self->update;	1929	$self->update;
1335	$self->check_size;
1336	}	1930	}
1337		1931
1338	sub set_markup {	1932	sub set_markup {
1339	my ($self, $markup) = @_;	1933	my ($self, $markup) = @_;
1340		1934
1341	return if $self->{text} eq "M$markup";	1935	return if $self->{text} eq "M$markup";
1342	$self->{text} = "M$markup";	1936	$self->{text} = "M$markup";
1343		1937
1344	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1938	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345		1939
1346	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347	$self->{layout}->set_markup ($markup);	1940	$self->{layout}->set_markup ($markup);
1348		1941
		1942	delete $self->{size_req};
		1943	$self->realloc;
1349	$self->update;	1944	$self->update;
1350	$self->check_size;
1351	}	1945	}
1352		1946
1353	sub size_request {	1947	sub size_request {
1354	my ($self) = @_;	1948	my ($self) = @_;
1355		1949
		1950	$self->{size_req} ||= do {
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1951	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1952	$self->{layout}->set_width ($self->{max_w} || -1);
		1953	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1954	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1955	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1956
1360	my ($w, $h) = $self->{layout}->size;	1957	my ($w, $h) = $self->{layout}->size;
1361		1958
1362	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1363	$self->{template}->set_font ($self->{font}) if $self->{font};	1960	$self->{template}->set_font ($self->{font}) if $self->{font};
		1961	$self->{template}->set_width ($self->{max_w} || -1);
1364	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1962	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1365		1963
1366	my ($w2, $h2) = $self->{template}->size;	1964	my ($w2, $h2) = $self->{template}->size;
1367		1965
1368	$w = List::Util::max $w, $w2;	1966	$w = List::Util::max $w, $w2;
1369	$h = List::Util::max $h, $h2;	1967	$h = List::Util::max $h, $h2;
		1968	}
		1969
		1970	[$w, $h]
1370	}	1971	};
1371		1972
1372	(	1973	@{ $self->{size_req} }
1373	$w + $self->{padding} * 2,
1374	$h + $self->{padding} * 2,
1375	)
1376	}	1974	}
1377		1975
		1976	sub baseline_shift {
		1977	$_[0]{layout}->descent
		1978	}
		1979
1378	sub size_allocate {	1980	sub invoke_size_allocate {
1379	my ($self, $w, $h) = @_;	1981	my ($self, $w, $h) = @_;
1380		1982
		1983	delete $self->{ox};
		1984
1381	delete $self->{texture};	1985	delete $self->{texture}
		1986	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1987
		1988	1
1382	}	1989	}
1383		1990
1384	sub set_fontsize {	1991	sub set_fontsize {
1385	my ($self, $fontsize) = @_;	1992	my ($self, $fontsize) = @_;
1386		1993
1387	$self->{fontsize} = $fontsize;	1994	$self->{fontsize} = $fontsize;
		1995	delete $self->{size_req};
1388	delete $self->{texture};	1996	delete $self->{texture};
1389		1997
1390	$self->update;	1998	$self->realloc;
1391	$self->check_size;	1999	}
		2000
		2001	sub reconfigure {
		2002	my ($self) = @_;
		2003
		2004	delete $self->{size_req};
		2005	delete $self->{texture};
		2006
		2007	$self->SUPER::reconfigure;
1392	}	2008	}
1393		2009
1394	sub _draw {	2010	sub _draw {
1395	my ($self) = @_;	2011	my ($self) = @_;
1396		2012
		2013	$self->SUPER::_draw; # draw background, if applicable
		2014
1397	my $tex = $self->{texture} ||= do {	2015	my $size = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	2016	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	2017	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	2018	$self->{layout}->set_width ($self->{w});
		2019	$self->{layout}->set_ellipsise ($self->{ellipsise});
		2020	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	2021	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		2022
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	2023	[$self->{layout}->size]
1404
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;
1408
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;
1412
1413	$tex
1414	};	2024	};
1415		2025
1416	glEnable GL_TEXTURE_2D;	2026	unless (exists $self->{ox}) {
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2027	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		2028	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		2029	: ($self->{w} - $size->[0]) * 0.5);
1418		2030
1419	if ($tex->{format} == GL_ALPHA) {	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1420	glColor @{$self->{fg}};	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1421	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	2033	: ($self->{h} - $size->[1]) * 0.5);
1422	} else {	2034
1423	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1424	}	2036	};
1425		2037
1426	glDisable GL_TEXTURE_2D;	2038	# unless ($self->{list}) {
		2039	# $self->{list} = CFPlus::OpenGL::glGenList;
		2040	# CFPlus::OpenGL::glNewList $self->{list};
		2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2042	# CFPlus::OpenGL::glEndList;
		2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
		2046
		2047	$self->{layout}->draw;
1427	}	2048	}
		2049
		2050	#sub destroy {
		2051	# my ($self) = @_;
		2052	#
		2053	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2054	#
		2055	# $self->SUPER::destroy;
		2056	#}
1428		2057
1429	#############################################################################	2058	#############################################################################
1430		2059
1431	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1432		2061
1433	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1434		2063
1435	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1436		2065
1437	sub new {	2066	sub new {
1438	my $class = shift;	2067	my $class = shift;
1439		2068
1440	$class->SUPER::new (	2069	$class->SUPER::new (
1441	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1442	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1443	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1444	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1445	can_hover => 1,	2076	can_hover => 1,
1446	can_focus => 1,	2077	can_focus => 1,
1447	valign => 0,	2078	valign => 0,
1448	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
		2081	#text => ...
		2082	#hidden => "*",
1449	@_	2083	@_
1450	)	2084	)
1451	}	2085	}
1452		2086
1453	sub _set_text {	2087	sub _set_text {
…		…
1455		2089
1456	delete $self->{cur_h};	2090	delete $self->{cur_h};
1457		2091
1458	return if $self->{text} eq $text;	2092	return if $self->{text} eq $text;
1459		2093
1460	delete $self->{texture};
1461
1462	$self->{last_activity} = $::NOW;	2094	$self->{last_activity} = $::NOW;
1463	$self->{text} = $text;	2095	$self->{text} = $text;
1464		2096
1465	$text =~ s/./*/g if $self->{hidden};	2097	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	2098	$self->{layout}->set_text ("$text ");
		2099	delete $self->{size_req};
1467		2100
1468	$self->emit (changed => $self->{text});	2101	$self->emit (changed => $self->{text});
		2102
		2103	$self->realloc;
		2104	$self->update;
1469	}	2105	}
1470		2106
1471	sub set_text {	2107	sub set_text {
1472	my ($self, $text) = @_;	2108	my ($self, $text) = @_;
1473		2109
1474	$self->{cursor} = length $text;	2110	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	2111	$self->_set_text ($text);
1476	$self->check_size;
1477	$self->update;
1478	}	2112	}
1479		2113
1480	sub get_text {	2114	sub get_text {
1481	$_[0]{text}	2115	$_[0]{text}
1482	}	2116	}
…		…
1487	my ($w, $h) = $self->SUPER::size_request;	2121	my ($w, $h) = $self->SUPER::size_request;
1488		2122
1489	($w + 1, $h) # add 1 for cursor	2123	($w + 1, $h) # add 1 for cursor
1490	}	2124	}
1491		2125
1492	sub size_allocate {
1493	my ($self, $w, $h) = @_;
1494
1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496	}
1497
1498	sub key_down {	2126	sub invoke_key_down {
1499	my ($self, $ev) = @_;	2127	my ($self, $ev) = @_;
1500		2128
1501	my $mod = $ev->{mod};	2129	my $mod = $ev->{mod};
1502	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1503	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1504		2132
1505	my $text = $self->get_text;	2133	my $text = $self->get_text;
		2134
		2135	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1506		2136
1507	if ($uni == 8) {	2137	if ($uni == 8) {
1508	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1509	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1510	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1511	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1512	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1513	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1514	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1515	} elsif ($sym == CFClient::SDLK_HOME) {	2145	} elsif ($sym == CFPlus::SDLK_HOME) {
		2146	# what a hack
		2147	$self->{cursor} =
		2148	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2149	? length $1
		2150	: 0;
		2151	} elsif ($sym == CFPlus::SDLK_END) {
		2152	# uh, again
		2153	$self->{cursor} =
		2154	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2155	? $self->{cursor} + length $1
		2156	: length $self->{text};
		2157	} elsif ($uni == 21) { # ctrl-u
		2158	$text = "";
1516	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1520	$self->emit ('escape');	2161	$self->emit ('escape');
1521	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
		2166	} else {
		2167	return 0;
1523	}	2168	}
1524		2169
1525	$self->_set_text ($text);	2170	$self->_set_text ($text);
		2171
		2172	$self->realloc;
1526	$self->update;	2173	$self->update;
1527	}
1528		2174
		2175	1
		2176	}
		2177
1529	sub focus_in {	2178	sub invoke_focus_in {
1530	my ($self) = @_;	2179	my ($self) = @_;
1531		2180
1532	$self->{last_activity} = $::NOW;	2181	$self->{last_activity} = $::NOW;
1533		2182
1534	$self->SUPER::focus_in;	2183	$self->SUPER::invoke_focus_in
1535	}	2184	}
1536		2185
1537	sub button_down {	2186	sub invoke_button_down {
1538	my ($self, $ev, $x, $y) = @_;	2187	my ($self, $ev, $x, $y) = @_;
1539		2188
1540	$self->SUPER::button_down ($ev, $x, $y);	2189	$self->SUPER::invoke_button_down ($ev, $x, $y);
1541		2190
1542	my $idx = $self->{layout}->xy_to_index ($x, $y);	2191	my $idx = $self->{layout}->xy_to_index ($x, $y);
1543		2192
1544	# byte-index to char-index	2193	# byte-index to char-index
1545	my $text = $self->{text};	2194	my $text = $self->{text};
1546	utf8::encode $text;	2195	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1547	$self->{cursor} = length substr $text, 0, $idx;	2196	$self->{cursor} = length $text;
1548		2197
1549	$self->_set_text ($self->{text});	2198	$self->_set_text ($self->{text});
1550	$self->update;	2199	$self->update;
		2200
		2201	1
1551	}	2202	}
1552		2203
1553	sub mouse_motion {	2204	sub invoke_mouse_motion {
1554	my ($self, $ev, $x, $y) = @_;	2205	my ($self, $ev, $x, $y) = @_;
1555	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2206	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2207
		2208	1
1556	}	2209	}
1557		2210
1558	sub _draw {	2211	sub _draw {
1559	my ($self) = @_;	2212	my ($self) = @_;
1560		2213
1561	local $self->{fg} = $self->{fg};	2214	local $self->{fg} = $self->{fg};
1562		2215
1563	if ($FOCUS == $self) {	2216	if ($FOCUS == $self) {
1564	glColor @{$self->{active_bg}};	2217	glColor_premultiply @{$self->{active_bg}};
1565	$self->{fg} = $self->{active_fg};	2218	$self->{fg} = $self->{active_fg};
1566	} else {	2219	} else {
1567	glColor @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1568	}	2221	}
1569		2222
1570	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1571	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1572	glBegin GL_QUADS;
1573	glVertex 0 , 0;
1574	glVertex 0 , $self->{h};
1575	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
1576	glVertex $self->{w}, 0;
1577	glEnd;
1578	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1579		2227
1580	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1581		2229
1582	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1584		2232
1585	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1586	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1587	utf8::encode $text;	2235	utf8::encode $text;
1588		2236
1589	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2237	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1590	}	2238	}
1591		2239
1592	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1593	glBegin GL_LINES;	2241	glBegin GL_LINES;
1594	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2242	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1595	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2243	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1596	glEnd;	2244	glEnd;
1597	}
1598	}
1599		2245
		2246	glLineWidth 3;
		2247	glColor @{$self->{active_outline}};
		2248	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2249	glLineWidth 1;
		2250
		2251	} else {
		2252	glColor @{$self->{outline}};
		2253	glTranslate .375, .375;
		2254	glBegin GL_LINE_STRIP;
		2255	glVertex 0, $self->{h} * .5;
		2256	glVertex 0, $self->{h} - 3;
		2257	glVertex $self->{w} - 1, $self->{h} - 3;
		2258	glVertex $self->{w} - 1, $self->{h} * .5;
		2259	glEnd;
		2260	}
		2261	}
		2262
		2263	#############################################################################
		2264
1600	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1601		2266
1602	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1603		2268
1604	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1605		2270
1606	sub key_down {	2271	sub invoke_key_down {
1607	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1608		2273
1609	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1610		2275
1611	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1612	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
		2279
1614	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	2282	$self->emit (activate => $txt);
1617	$self->update;	2283	$self->update;
1618		2284
1619	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1622	}	2288	}
1623	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1624	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1626	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1627	}	2293	}
1628	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1629	}	2295	}
1630		2296
1631	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1632	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1633	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1634		2300
1635	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1636	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1637	} else {	2303	} else {
1638	$self->set_text ($self->{history_saveback});	2304	$self->set_text ($self->{history_saveback});
1639	}	2305	}
1640		2306
1641	} else {	2307	} else {
1642	$self->SUPER::key_down ($ev);	2308	return $self->SUPER::invoke_key_down ($ev)
		2309	}
		2310
1643	}	2311	1
1644
1645	}	2312	}
1646		2313
1647	#############################################################################	2314	#############################################################################
1648		2315
		2316	package CFPlus::UI::TextEdit;
		2317
		2318	our @ISA = CFPlus::UI::EntryBase::;
		2319
		2320	use CFPlus::OpenGL;
		2321
		2322	sub move_cursor_ver {
		2323	my ($self, $dy) = @_;
		2324
		2325	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2326
		2327	$y += $dy;
		2328
		2329	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2330	$self->{cursor} = $index;
		2331	delete $self->{cur_h};
		2332	$self->update;
		2333	return;
		2334	}
		2335	}
		2336
		2337	sub invoke_key_down {
		2338	my ($self, $ev) = @_;
		2339
		2340	my $sym = $ev->{sym};
		2341
		2342	if ($sym == CFPlus::SDLK_UP) {
		2343	$self->move_cursor_ver (-1);
		2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2345	$self->move_cursor_ver (+1);
		2346	} else {
		2347	return $self->SUPER::invoke_key_down ($ev)
		2348	}
		2349
		2350	1
		2351	}
		2352
		2353	#############################################################################
		2354
1649	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
1650		2356
1651	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
1652		2358
1653	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
1654		2360
1655	my @tex =	2361	my @tex =
1656	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1657	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
1658		2364
1659	sub new {	2365	sub new {
1660	my $class = shift;	2366	my $class = shift;
1661		2367
1662	$class->SUPER::new (	2368	$class->SUPER::new (
		2369	can_hover => 1,
		2370	align => 0,
		2371	valign => 0,
		2372	can_events => 1,
		2373	@_
		2374	)
		2375	}
		2376
		2377	sub invoke_button_up {
		2378	my ($self, $ev, $x, $y) = @_;
		2379
		2380	$self->emit ("activate")
		2381	if $x >= 0 && $x < $self->{w}
		2382	&& $y >= 0 && $y < $self->{h};
		2383
		2384	1
		2385	}
		2386
		2387	sub _draw {
		2388	my ($self) = @_;
		2389
		2390	glEnable GL_TEXTURE_2D;
		2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2392	glColor 0, 0, 0, 1;
		2393
		2394	my $tex = $tex[$GRAB == $self];
		2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2396
		2397	glDisable GL_TEXTURE_2D;
		2398
		2399	$self->SUPER::_draw;
		2400	}
		2401
		2402	#############################################################################
		2403
		2404	package CFPlus::UI::Button;
		2405
		2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
		2409
		2410	my @tex =
		2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2412	qw(b1_button_inactive.png b1_button_active.png);
		2413
		2414	sub new {
		2415	my $class = shift;
		2416
		2417	$class->SUPER::new (
1663	padding => 4,	2418	padding_x => 4,
		2419	padding_y => 4,
		2420	fg => [1.0, 1.0, 1.0],
		2421	active_fg => [0.8, 0.8, 0.8],
		2422	can_hover => 1,
		2423	align => 0,
		2424	valign => 0,
		2425	can_events => 1,
		2426	@_
		2427	)
		2428	}
		2429
		2430	sub invoke_button_up {
		2431	my ($self, $ev, $x, $y) = @_;
		2432
		2433	$self->emit ("activate")
		2434	if $x >= 0 && $x < $self->{w}
		2435	&& $y >= 0 && $y < $self->{h};
		2436
		2437	1
		2438	}
		2439
		2440	sub _draw {
		2441	my ($self) = @_;
		2442
		2443	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2444
		2445	glEnable GL_TEXTURE_2D;
		2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2447	glColor 0, 0, 0, 1;
		2448
		2449	my $tex = $tex[$GRAB == $self];
		2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2451
		2452	glDisable GL_TEXTURE_2D;
		2453
		2454	$self->SUPER::_draw;
		2455	}
		2456
		2457	#############################################################################
		2458
		2459	package CFPlus::UI::CheckBox;
		2460
		2461	our @ISA = CFPlus::UI::DrawBG::;
		2462
		2463	my @tex =
		2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2466
		2467	use CFPlus::OpenGL;
		2468
		2469	sub new {
		2470	my $class = shift;
		2471
		2472	$class->SUPER::new (
		2473	padding_x => 2,
		2474	padding_y => 2,
		2475	fg => [1, 1, 1],
		2476	active_fg => [1, 1, 0],
		2477	bg => [0, 0, 0, 0.2],
		2478	active_bg => [1, 1, 1, 0.5],
		2479	state => 0,
		2480	can_hover => 1,
		2481	@_
		2482	)
		2483	}
		2484
		2485	sub size_request {
		2486	my ($self) = @_;
		2487
		2488	(6) x 2
		2489	}
		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
		2499	sub invoke_button_down {
		2500	my ($self, $ev, $x, $y) = @_;
		2501
		2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2504	$self->toggle;
		2505	} else {
		2506	return 0
		2507	}
		2508
		2509	1
		2510	}
		2511
		2512	sub _draw {
		2513	my ($self) = @_;
		2514
		2515	$self->SUPER::_draw;
		2516
		2517	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2518
		2519	my ($w, $h) = @$self{qw(w h)};
		2520
		2521	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2522
		2523	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2524
		2525	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2526
		2527	glEnable GL_TEXTURE_2D;
		2528	$tex->draw_quad_alpha (0, 0, $s, $s);
		2529	glDisable GL_TEXTURE_2D;
		2530	}
		2531
		2532	#############################################################################
		2533
		2534	package CFPlus::UI::Image;
		2535
		2536	our @ISA = CFPlus::UI::Base::;
		2537
		2538	use CFPlus::OpenGL;
		2539
		2540	our %texture_cache;
		2541
		2542	sub new {
		2543	my $class = shift;
		2544
		2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	scale => 1,
		2548	@_,
		2549	);
		2550
		2551	$self->{path} || $self->{tex}
		2552	or Carp::croak "'path' or 'tex' attributes required";
		2553
		2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2555	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2556
		2557	CFPlus::weaken $texture_cache{$self->{path}};
		2558
		2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2560
		2561	$self
		2562	}
		2563
		2564	sub STORABLE_freeze {
		2565	my ($self, $cloning) = @_;
		2566
		2567	$self->{path}
		2568	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2569
		2570	$self->{path}
		2571	}
		2572
		2573	sub STORABLE_attach {
		2574	my ($self, $cloning, $path) = @_;
		2575
		2576	$self->new (path => $path)
		2577	}
		2578
		2579	sub size_request {
		2580	my ($self) = @_;
		2581
		2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2583	}
		2584
		2585	sub _draw {
		2586	my ($self) = @_;
		2587
		2588	my $tex = $self->{tex};
		2589
		2590	my ($w, $h) = ($self->{w}, $self->{h});
		2591
		2592	if ($self->{rot90}) {
		2593	glRotate 90, 0, 0, 1;
		2594	glTranslate 0, -$self->{w}, 0;
		2595
		2596	($w, $h) = ($h, $w);
		2597	}
		2598
		2599	glEnable GL_TEXTURE_2D;
		2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2601
		2602	$tex->draw_quad_alpha (0, 0, $w, $h);
		2603
		2604	glDisable GL_TEXTURE_2D;
		2605	}
		2606
		2607	#############################################################################
		2608
		2609	package CFPlus::UI::ImageButton;
		2610
		2611	our @ISA = CFPlus::UI::Image::;
		2612
		2613	use CFPlus::OpenGL;
		2614
		2615	my %textures;
		2616
		2617	sub new {
		2618	my $class = shift;
		2619
		2620	my $self = $class->SUPER::new (
		2621	padding_x => 4,
		2622	padding_y => 4,
1664	fg => [1, 1, 1],	2623	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	2624	active_fg => [0, 0, 1],
1667	can_hover => 1,	2625	can_hover => 1,
1668	align => 0,	2626	align => 0,
1669	valign => 0,	2627	valign => 0,
1670	can_events => 1,	2628	can_events => 1,
1671	@_	2629	@_
1672	)	2630	);
1673	}	2631	}
1674		2632
1675	sub button_up {	2633	sub invoke_button_down {
1676	my ($self, $ev, $x, $y) = @_;	2634	my ($self, $ev, $x, $y) = @_;
1677		2635
		2636	1
		2637	}
		2638
		2639	sub invoke_button_up {
		2640	my ($self, $ev, $x, $y) = @_;
		2641
		2642	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	2643	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	2644	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");	2645
1681	}	2646	1
1682	}
1683
1684	sub _draw {
1685	my ($self) = @_;
1686
1687	local $self->{fg} = $self->{fg};
1688
1689	if ($GRAB == $self) {
1690	$self->{fg} = $self->{active_fg};
1691	}
1692
1693	glEnable GL_TEXTURE_2D;
1694	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695	glColor 0, 0, 0, 1;
1696
1697	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1698
1699	glDisable GL_TEXTURE_2D;
1700
1701	$self->SUPER::_draw;
1702	}	2647	}
1703		2648
1704	#############################################################################	2649	#############################################################################
1705		2650
1706	package CFClient::UI::CheckBox;
1707
1708	our @ISA = CFClient::UI::DrawBG::;
1709
1710	my @tex =
1711	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1712	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1713
1714	use CFClient::OpenGL;
1715
1716	sub new {
1717	my $class = shift;
1718
1719	$class->SUPER::new (
1720	padding => 2,
1721	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],
1723	state => 0,
1724	can_hover => 1,
1725	@_
1726	)
1727	}
1728
1729	sub size_request {
1730	my ($self) = @_;
1731
1732	($self->{padding} * 2 + 6) x 2
1733	}
1734
1735	sub button_down {
1736	my ($self, $ev, $x, $y) = @_;
1737
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});
1742	}
1743	}
1744
1745	sub _draw {
1746	my ($self) = @_;
1747
1748	$self->SUPER::_draw;
1749
1750	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1751
1752	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1753
1754	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755
1756	my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1758	glEnable GL_TEXTURE_2D;
1759	$tex->draw_quad_alpha (0, 0, $s, $s);
1760	glDisable GL_TEXTURE_2D;
1761	}
1762
1763	#############################################################################
1764
1765	package CFClient::UI::Image;	2651	package CFPlus::UI::VGauge;
1766		2652
1767	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
1768
1769	use CFClient::OpenGL;
1770	use Carp qw/confess/;
1771
1772	our %loaded_images;
1773
1774	sub new {
1775	my $class = shift;
1776
1777	my $self = $class->SUPER::new (can_events => 0, @_);
1778
1779	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1780
1781	$loaded_images{$self->{image}} ||=
1782	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1783
1784	my $tex = $self->{tex} = $loaded_images{$self->{image}};
1785
1786	Scalar::Util::weaken $loaded_images{$self->{image}};
1787
1788	$self->{aspect} = $tex->{w} / $tex->{h};
1789
1790	$self
1791	}
1792
1793	sub size_request {
1794	my ($self) = @_;
1795
1796	($self->{tex}->{w}, $self->{tex}->{h})
1797	}
1798
1799	sub _draw {
1800	my ($self) = @_;
1801
1802	my $tex = $self->{tex};
1803
1804	my ($w, $h) = ($self->{w}, $self->{h});
1805
1806	if ($self->{rot90}) {
1807	glRotate 90, 0, 0, 1;
1808	glTranslate 0, -$self->{w}, 0;
1809
1810	($w, $h) = ($h, $w);
1811	}
1812
1813	glEnable GL_TEXTURE_2D;
1814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1815
1816	$tex->draw_quad_alpha (0, 0, $w, $h);
1817
1818	glDisable GL_TEXTURE_2D;
1819	}
1820
1821	#############################################################################
1822
1823	package CFClient::UI::VGauge;
1824
1825	our @ISA = CFClient::UI::Base::;
1826		2654
1827	use List::Util qw(min max);	2655	use List::Util qw(min max);
1828		2656
1829	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
1830		2658
1831	my %tex = (	2659	my %tex = (
1832	food => [	2660	food => [
1833	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1834	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1835	],	2663	],
1836	grace => [	2664	grace => [
1837	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1838	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2666	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1839	],	2667	],
1840	hp => [	2668	hp => [
1841	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1842	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1843	],	2671	],
1844	mana => [	2672	mana => [
1845	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1846	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2674	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1847	],	2675	],
1848	);	2676	);
1849		2677
1850	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
1910	my $ycut1 = max 0, min 1, $ycut;	2738	my $ycut1 = max 0, min 1, $ycut;
1911	my $ycut2 = max 0, min 1, $ycut - 1;	2739	my $ycut2 = max 0, min 1, $ycut - 1;
1912		2740
1913	my $h1 = $self->{h} * (1 - $ycut1);	2741	my $h1 = $self->{h} * (1 - $ycut1);
1914	my $h2 = $self->{h} * (1 - $ycut2);	2742	my $h2 = $self->{h} * (1 - $ycut2);
		2743	my $h3 = $self->{h};
		2744
		2745	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1915		2746
1916	glEnable GL_BLEND;	2747	glEnable GL_BLEND;
1917	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2748	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2749	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1918	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
1919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1920		2752
1921	glBindTexture GL_TEXTURE_2D, $t1->{name};	2753	glBindTexture GL_TEXTURE_2D, $t1->{name};
1922	glBegin GL_QUADS;	2754	glBegin GL_QUADS;
…		…
1937		2769
1938	if ($t3) {	2770	if ($t3) {
1939	glBindTexture GL_TEXTURE_2D, $t3->{name};	2771	glBindTexture GL_TEXTURE_2D, $t3->{name};
1940	glBegin GL_QUADS;	2772	glBegin GL_QUADS;
1941	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2773	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1942	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2774	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1943	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2775	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1944	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2776	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1945	glEnd;	2777	glEnd;
1946	}	2778	}
1947		2779
1948	glDisable GL_BLEND;	2780	glDisable GL_BLEND;
1949	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
1950	}	2782	}
1951		2783
1952	#############################################################################	2784	#############################################################################
1953		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	%arg,
		2806	text => "-",
		2807	value => -1,
		2808	);
		2809
		2810	$self->set_value ($arg{value}) if exists $arg{value};
		2811
		2812	$self
		2813	}
		2814
		2815	sub set_value {
		2816	my ($self, $value) = @_;
		2817
		2818	if ($self->{value} != $value) {
		2819	$self->{value} = $value;
		2820	$self->set_text (sprintf "%d%%", $value * 100);
		2821	$self->update;
		2822	}
		2823	}
		2824
		2825	sub _draw {
		2826	my ($self) = @_;
		2827
		2828	glEnable GL_BLEND;
		2829	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2830
		2831	if ($self->{value} >= 0) {
		2832	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2833
		2834	glColor_premultiply @{$self->{bar}};
		2835	glRect 2, 2, $s, $self->{h} - 2;
		2836	glColor_premultiply @{$self->{bg}};
		2837	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2838	}
		2839
		2840	glColor_premultiply @{$self->{outline}};
		2841	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2842
		2843	glDisable GL_BLEND;
		2844
		2845	{
		2846	local $self->{bg}; # do not draw background
		2847	$self->SUPER::_draw;
		2848	}
		2849	}
		2850
		2851	#############################################################################
		2852
		2853	package CFPlus::UI::ExperienceProgress;
		2854
		2855	our @ISA = CFPlus::UI::Progress::;
		2856
		2857	sub new {
		2858	my ($class, %arg) = @_;
		2859
		2860	my $self = $class->SUPER::new (
		2861	%arg
		2862	);
		2863
		2864	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2865	if $::CONN;
		2866
		2867	$self
		2868	}
		2869
		2870	sub DESTROY {
		2871	my ($self) = @_;
		2872
		2873	delete $::CONN->{on_exp_update}{$self+0}
		2874	if $::CONN;
		2875
		2876	$self->SUPER::DESTROY;
		2877	}
		2878
		2879	sub set_value {
		2880	my ($self, $lvl, $exp) = @_;
		2881
		2882	my $v = 0;
		2883
		2884	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2885	my $l0 = $table->[$lvl - 1];
		2886	my $l1 = $table->[$lvl];
		2887
		2888	$v = ($exp - $l0) / ($l1 - $l0);
		2889	}
		2890
		2891	$self->SUPER::set_value ($v);
		2892	}
		2893
		2894	#############################################################################
		2895
1954	package CFClient::UI::Gauge;	2896	package CFPlus::UI::Gauge;
1955		2897
1956	our @ISA = CFClient::UI::VBox::;	2898	our @ISA = CFPlus::UI::VBox::;
1957		2899
1958	sub new {	2900	sub new {
1959	my ($class, %arg) = @_;	2901	my ($class, %arg) = @_;
1960		2902
1961	my $self = $class->SUPER::new (	2903	my $self = $class->SUPER::new (
…		…
1963	can_hover => 1,	2905	can_hover => 1,
1964	can_events => 1,	2906	can_events => 1,
1965	%arg,	2907	%arg,
1966	);	2908	);
1967		2909
1968	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2910	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1969	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2911	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1970	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2912	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1971		2913
1972	$self	2914	$self
1973	}	2915	}
1974		2916
1975	sub set_fontsize {	2917	sub set_fontsize {
…		…
1996	$self->{value}->set_text ($val);	2938	$self->{value}->set_text ($val);
1997	}	2939	}
1998		2940
1999	#############################################################################	2941	#############################################################################
2000		2942
2001	package CFClient::UI::Slider;	2943	package CFPlus::UI::Slider;
2002		2944
2003	use strict;	2945	use strict;
2004		2946
2005	use CFClient::OpenGL;	2947	use CFPlus::OpenGL;
2006		2948
2007	our @ISA = CFClient::UI::DrawBG::;	2949	our @ISA = CFPlus::UI::DrawBG::;
2008		2950
2009	my @tex =	2951	my @tex =
2010	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2952	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2011	qw(s1_slider.png s1_slider_bg.png);	2953	qw(s1_slider.png s1_slider_bg.png);
2012		2954
2013	sub new {	2955	sub new {
2014	my $class = shift;	2956	my $class = shift;
2015		2957
2016	# range [value, low, high, page]	2958	# range [value, low, high, page, unit]
2017		2959
2018	# TODO: 0-width page	2960	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2961	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2962	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2963	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2964	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2965	active_fg => [0, 0, 0],
		2966	bg => [0, 0, 0, 0.2],
		2967	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2968	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2969	min_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2970	min_h => $::WIDTH / 80,
2027	vertical => 0,	2971	vertical => 0,
2028	can_hover => 1,	2972	can_hover => 1,
2029	inner_pad => 5,	2973	inner_pad => 0.02,
2030	@_	2974	@_
2031	);	2975	);
2032		2976
		2977	$self->set_value ($self->{range}[0]);
		2978	$self->update;
		2979
2033	$self	2980	$self
2034	}	2981	}
2035		2982
		2983	sub set_range {
		2984	my ($self, $range) = @_;
		2985
		2986	($range, $self->{range}) = ($self->{range}, $range);
		2987
		2988	if ("@$range" ne "@{$self->{range}}") {
		2989	$self->update;
		2990	$self->set_value ($self->{range}[0]);
		2991	}
		2992	}
		2993
		2994	sub set_value {
		2995	my ($self, $value) = @_;
		2996
		2997	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2998
		2999	$hi = $lo + 1 if $hi <= $lo;
		3000
		3001	$page = $hi - $lo if $page > $hi - $lo;
		3002
		3003	$value = $lo if $value < $lo;
		3004	$value = $hi - $page if $value > $hi - $page;
		3005
		3006	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		3007	if $unit;
		3008
		3009	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		3010
		3011	if ($value != $old_value) {
		3012	$self->emit (changed => $value);
		3013	$self->update;
		3014	}
		3015	}
		3016
2036	sub size_request {	3017	sub size_request {
2037	my ($self) = @_;	3018	my ($self) = @_;
2038		3019
2039	my $w = $self->{req_w};	3020	($self->{req_w}, $self->{req_h})
2040	my $h = $self->{req_h};
2041
2042	$self->{vertical} ? ($h, $w) : ($w, $h)
2043	}	3021	}
2044		3022
2045	sub button_down {	3023	sub invoke_button_down {
2046	my ($self, $ev, $x, $y) = @_;	3024	my ($self, $ev, $x, $y) = @_;
2047		3025
2048	$self->SUPER::button_down ($ev, $x, $y);	3026	$self->SUPER::invoke_button_down ($ev, $x, $y);
		3027
		3028	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		3029
2049	$self->mouse_motion ($ev, $x, $y);	3030	$self->invoke_mouse_motion ($ev, $x, $y);
2050	}
2051		3031
		3032	1
		3033	}
		3034
2052	sub mouse_motion {	3035	sub invoke_mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	3036	my ($self, $ev, $x, $y) = @_;
2054		3037
2055	if ($GRAB == $self) {	3038	if ($GRAB == $self) {
		3039	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		3040
		3041	my (undef, $lo, $hi, $page) = @{$self->{range}};
		3042
		3043	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		3044
		3045	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		3046	} else {
		3047	return 0;
		3048	}
		3049
		3050	1
		3051	}
		3052
		3053	sub invoke_mouse_wheel {
		3054	my ($self, $ev) = @_;
		3055
		3056	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3057
		3058	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3059
		3060	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		3061
		3062	1
		3063	}
		3064
		3065	sub update {
		3066	my ($self) = @_;
		3067
		3068	delete $self->{knob_w};
		3069	$self->SUPER::update;
		3070	}
		3071
		3072	sub _draw {
		3073	my ($self) = @_;
		3074
		3075	unless ($self->{knob_w}) {
		3076	$self->set_value ($self->{range}[0]);
		3077
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	3078	my ($value, $lo, $hi, $page) = @{$self->{range}};
		3079	my $range = ($hi - $page - $lo) || 1e-100;
2057		3080
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	3081	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		3082
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	3083	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	3084	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		3085
2063	$x -= $inner_pad_px; # substract the padding	3086	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	3087	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		3088
2069	$self->emit (changed => $x);	3089	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	3090	$self->{knob_w} = $knob_w;
2071	}	3091	}
2072	}
2073
2074	# the inner_* stuff is for generating a padding for the slider handle,
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}
2081
2082	sub _draw {
2083	my ($self) = @_;
2084		3092
2085	$self->SUPER::_draw ();	3093	$self->SUPER::_draw ();
2086		3094
2087	my ($w, $h) = @$self{qw(w h)};	3095	glScale $self->{w}, $self->{h};
2088		3096
2089	if ($self->{vertical}) {	3097	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	3098	# draw a vertical slider like a rotated horizontal slider
2091		3099
		3100	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	3101	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	3102	}
2097		3103
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	3104	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	3105	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		3106
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page ||= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	3107	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3108	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		3109
2122	# draw background	3110	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	3111	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		3112
2125	# draw handle	3113	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	3114	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		3115
2128	glDisable GL_TEXTURE_2D;	3116	glDisable GL_TEXTURE_2D;
2129	}	3117	}
2130		3118
2131	#############################################################################	3119	#############################################################################
2132		3120
2133	package CFClient::UI::TextView;	3121	package CFPlus::UI::ValSlider;
2134		3122
2135	our @ISA = CFClient::UI::HBox::;	3123	our @ISA = CFPlus::UI::HBox::;
2136		3124
		3125	sub new {
		3126	my ($class, %arg) = @_;
		3127
		3128	my $range = delete $arg{range};
		3129
		3130	my $self = $class->SUPER::new (
		3131	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
		3132	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
		3133	to_value => sub { shift },
		3134	from_value => sub { shift },
		3135	%arg,
		3136	);
		3137
		3138	$self->{slider}->connect (changed => sub {
		3139	my ($self, $value) = @_;
		3140	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		3141	$self->{parent}->emit (changed => $value);
		3142	});
		3143
		3144	# $self->{entry}->connect (changed => sub {
		3145	# my ($self, $value) = @_;
		3146	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		3147	# $self->{parent}->emit (changed => $value);
		3148	# });
		3149
		3150	$self->add ($self->{slider}, $self->{entry});
		3151
		3152	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		3153
		3154	$self
		3155	}
		3156
		3157	sub set_range { shift->{slider}->set_range (@_) }
		3158	sub set_value { shift->{slider}->set_value (@_) }
		3159
		3160	#############################################################################
		3161
		3162	package CFPlus::UI::TextScroller;
		3163
		3164	our @ISA = CFPlus::UI::HBox::;
		3165
2137	use CFClient::OpenGL;	3166	use CFPlus::OpenGL;
2138		3167
2139	sub new {	3168	sub new {
2140	my $class = shift;	3169	my $class = shift;
2141		3170
2142	my $self = $class->SUPER::new (	3171	my $self = $class->SUPER::new (
2143	fontsize => 1,	3172	fontsize => 1,
2144	can_events => 0,	3173	can_events => 1,
		3174	indent => 0,
2145	#font => default_font	3175	#font => default_font
2146	@_,	3176	@_,
2147		3177
2148	layout => (new CFClient::Layout 1),	3178	layout => (new CFPlus::Layout),
2149	par => [],	3179	par => [],
		3180	max_par => 0,
2150	height => 0,	3181	height => 0,
2151	children => [	3182	children => [
2152	(new CFClient::UI::Empty expand => 1),	3183	(new CFPlus::UI::Empty expand => 1),
2153	(new CFClient::UI::Slider vertical => 1),	3184	(new CFPlus::UI::Slider vertical => 1),
2154	],	3185	],
2155	);	3186	);
2156		3187
2157	$self->{children}[1]->connect (changed => sub { $self->update });	3188	$self->{children}[1]->connect (changed => sub { $self->update });
2158		3189
…		…
2164		3195
2165	$self->{fontsize} = $fontsize;	3196	$self->{fontsize} = $fontsize;
2166	$self->reflow;	3197	$self->reflow;
2167	}	3198	}
2168		3199
2169	sub text_height {	3200	sub size_request {
		3201	my ($self) = @_;
		3202
		3203	my ($empty, $slider) = $self->visible_children;
		3204
		3205	local $self->{children} = [$empty, $slider];
		3206	$self->SUPER::size_request
		3207	}
		3208
		3209	sub invoke_size_allocate {
		3210	my ($self, $w, $h) = @_;
		3211
		3212	my ($empty, $slider, @other) = @{ $self->{children} };
		3213	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3214
		3215	$self->{layout}->set_font ($self->{font}) if $self->{font};
		3216	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		3217	$self->{layout}->set_width ($empty->{w});
		3218	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
		3219
		3220	$self->reflow;
		3221
		3222	local $self->{children} = [$empty, $slider];
		3223	$self->SUPER::invoke_size_allocate ($w, $h)
		3224	}
		3225
		3226	sub invoke_mouse_wheel {
2170	my ($self, $text) = @_;	3227	my ($self, $ev) = @_;
		3228
		3229	return 0 unless $ev->{dy}; # only vertical movements
		3230
		3231	$self->{children}[1]->emit (mouse_wheel => $ev);
		3232
		3233	1
		3234	}
		3235
		3236	sub get_layout {
		3237	my ($self, $para) = @_;
2171		3238
2172	my $layout = $self->{layout};	3239	my $layout = $self->{layout};
2173		3240
		3241	$layout->set_font ($self->{font}) if $self->{font};
		3242	$layout->set_foreground (@{$para->{fg}});
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3243	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});	3244	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3245	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2176	$layout->set_markup ($text);	3246	$layout->set_markup ($para->{markup});
		3247
		3248	$layout->set_shapes (
		3249	map
		3250	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3251	@{$para->{widget}}
2177		3252	);
2178	($layout->size)[1]	3253
		3254	$layout
2179	}	3255	}
2180		3256
2181	sub reflow {	3257	sub reflow {
2182	my ($self) = @_;	3258	my ($self) = @_;
2183		3259
2184	$self->{need_reflow}++;	3260	$self->{need_reflow}++;
2185	$self->update;	3261	$self->update;
2186	}	3262	}
2187		3263
2188	sub size_allocate {	3264	sub set_offset {
		3265	my ($self, $offset) = @_;
		3266
		3267	# todo: base offset on lines or so, not on pixels
		3268	$self->{children}[1]->set_value ($offset);
		3269	}
		3270
		3271	sub current_paragraph {
		3272	my ($self) = @_;
		3273
		3274	$self->{top_paragraph} - 1
		3275	}
		3276
		3277	sub scroll_to {
2189	my ($self, $w, $h) = @_;	3278	my ($self, $para) = @_;
2190		3279
2191	$self->SUPER::size_allocate ($w, $h);	3280	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2192		3281
2193	$self->{layout}->set_font ($self->{font}) if $self->{font};	3282	$self->{scroll_to} = $para;
2194	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3283	$self->update;
2195	$self->{layout}->set_width ($self->{children}[0]{w});	3284	}
2196		3285
2197	$self->reflow;	3286	sub clear {
		3287	my ($self) = @_;
		3288
		3289	my (undef, undef, @other) = @{ $self->{children} };
		3290	$self->remove ($_) for @other;
		3291
		3292	$self->{par} = [];
		3293	$self->{height} = 0;
		3294	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2198	}	3295	}
2199		3296
2200	sub add_paragraph {	3297	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	3298	my $self = shift;
2202		3299
2203	#TODO: intelligently "reformat" paragraph	3300	for my $para (@_) {
		3301	$para = {
		3302	fg => [1, 1, 1, 1],
		3303	indent => 0,
		3304	markup => "",
		3305	widget => [],
		3306	ref $para ? %$para : (markup => $para),
		3307	w => 1e10,
		3308	wrapped => 1,
		3309	};
2204		3310
2205	my $height = $self->text_height ($text);	3311	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3312	push @{$self->{par}}, $para;
		3313	}
2206		3314
		3315	if (my $max = $self->{max_par}) {
		3316	shift @{$self->{par}} while @{$self->{par}} > $max;
		3317	}
		3318
		3319	$self->{need_reflow}++;
		3320	$self->update;
		3321	}
		3322
		3323	sub scroll_to_bottom {
		3324	my ($self) = @_;
		3325
		3326	$self->{scroll_to} = $#{$self->{par}};
		3327	$self->update;
		3328	}
		3329
		3330	sub force_uptodate {
		3331	my ($self) = @_;
		3332
		3333	if (delete $self->{need_reflow}) {
		3334	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3335
		3336	my $height = 0;
		3337
		3338	for my $para (@{$self->{par}}) {
		3339	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3340	my $layout = $self->get_layout ($para);
		3341	my ($w, $h) = $layout->size;
		3342
		3343	$para->{w} = $w + $para->{indent};
		3344	$para->{h} = $h;
		3345	$para->{wrapped} = $layout->has_wrapped;
		3346	}
		3347
		3348	$para->{y} = $height;
		3349	$height += $para->{h};
		3350	}
		3351
2207	$self->{height} += $height;	3352	$self->{height} = $height;
		3353	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2208		3354
2209	push @{$self->{par}}, [$height, $color, $text];	3355	delete $self->{texture};
		3356	}
2210		3357
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	3358	if (my $paridx = delete $self->{scroll_to}) {
2212	$self->{children}[1]->update;	3359	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3360	}
2213	}	3361	}
2214		3362
2215	sub update {	3363	sub update {
2216	my ($self) = @_;	3364	my ($self) = @_;
2217		3365
…		…
2219		3367
2220	return unless $self->{h} > 0;	3368	return unless $self->{h} > 0;
2221		3369
2222	delete $self->{texture};	3370	delete $self->{texture};
2223		3371
2224	$ROOT->on_post_alloc ($self, sub {	3372	$ROOT->on_post_alloc ($self => sub {
2225	if (delete $self->{need_reflow}) {	3373	$self->force_uptodate;
2226	my $height = 0;
2227		3374
2228	$height += $_->[0] = $self->text_height ($_->[2])	3375	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2229	for @{$self->{par}};
2230		3376
2231	$self->{height} = $height;	3377	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2232
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2234
2235	delete $self->{texture};
2236	}
2237
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2239	glClearColor 0, 0, 0, 0;	3378	glClearColor 0, 0, 0, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	3379	glClear GL_COLOR_BUFFER_BIT;
2241		3380
2242	glEnable GL_TEXTURE_2D;	3381	package CFPlus::UI::Base;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3382	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3383	(0, 0, $self->{w}, $self->{h});
2244		3384
2245	my $top = int $self->{children}[1]{range}[0];	3385	my $top = int $self->{children}[1]{range}[0];
2246		3386
		3387	my $paridx = 0;
		3388	my $top_paragraph;
		3389	my $top = int $self->{children}[1]{range}[0];
		3390
2247	my $y0 = $top;	3391	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	3392	my $y1 = $top + $H;
2249		3393
2250	my $y = 0;
2251
2252	my $layout = $self->{layout};
2253
2254	$layout->set_font ($self->{font}) if $self->{font};
2255
2256	for my $par (@{$self->{par}}) {	3394	for my $para (@{$self->{par}}) {
2257	my $h = $par->[0];	3395	my $h = $para->{h};
		3396	my $y = $para->{y};
2258		3397
2259	if ($y0 < $y + $h && $y < $y1) {	3398	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	3399	my $layout = $self->get_layout ($para);
2261	$layout->set_markup ($par->[2]);
2262		3400
2263	my ($W, $H) = $layout->size;	3401	$layout->render ($para->{indent}, $y - $y0);
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	3402	$layout->draw;
		3403
		3404	if (my @w = @{ $para->{widget} }) {
		3405	my @s = $layout->get_shapes;
		3406
		3407	for (@w) {
		3408	my ($dx, $dy) = splice @s, 0, 2, ();
		3409
		3410	$_->{x} = $dx + $para->{indent};
		3411	$_->{y} = $dy + $y - $y0;
		3412
		3413	$_->draw;
		3414	}
		3415	}
2265	}	3416	}
2266		3417
2267	$y += $h;	3418	$paridx++;
		3419	$top_paragraph ||= $paridx if $y >= $top;
2268	}	3420	}
2269		3421
2270	glDisable GL_TEXTURE_2D;	3422	$self->{top_paragraph} = $top_paragraph;
2271	};	3423	};
2272	});	3424	});
2273	}	3425	}
2274		3426
		3427	sub reconfigure {
		3428	my ($self) = @_;
		3429
		3430	$self->SUPER::reconfigure;
		3431
		3432	$_->{w} = 1e10 for @{ $self->{par} };
		3433	$self->reflow;
		3434	}
		3435
2275	sub _draw {	3436	sub _draw {
2276	my ($self) = @_;	3437	my ($self) = @_;
2277		3438
2278	glEnable GL_TEXTURE_2D;	3439	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3440	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	3441	glColor 0, 0, 0, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3442	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	3443	glDisable GL_TEXTURE_2D;
2283		3444
2284	$self->{children}[1]->draw;	3445	$self->{children}[1]->draw;
2285
2286	}	3446	}
2287		3447
2288	#############################################################################	3448	#############################################################################
2289		3449
2290	package CFClient::UI::Animator;	3450	package CFPlus::UI::Animator;
2291		3451
2292	use CFClient::OpenGL;	3452	use CFPlus::OpenGL;
2293		3453
2294	our @ISA = CFClient::UI::Bin::;	3454	our @ISA = CFPlus::UI::Bin::;
2295		3455
2296	sub moveto {	3456	sub moveto {
2297	my ($self, $x, $y) = @_;	3457	my ($self, $x, $y) = @_;
2298		3458
2299	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3459	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2327	glPopMatrix;	3487	glPopMatrix;
2328	}	3488	}
2329		3489
2330	#############################################################################	3490	#############################################################################
2331		3491
2332	package CFClient::UI::Flopper;	3492	package CFPlus::UI::Flopper;
2333		3493
2334	our @ISA = CFClient::UI::Button::;	3494	our @ISA = CFPlus::UI::Button::;
2335		3495
2336	sub new {	3496	sub new {
2337	my $class = shift;	3497	my $class = shift;
2338		3498
2339	my $self = $class->SUPER::new (	3499	my $self = $class->SUPER::new (
2340	state => 0,	3500	state => 0,
2341	connect_activate => \&toggle_flopper,	3501	on_activate => \&toggle_flopper,
2342	@_	3502	@_
2343	);	3503	);
2344		3504
2345	if ($self->{state}) {
2346	$self->{state} = 0;
2347	$self->toggle_flopper;
2348	}
2349
2350	$self	3505	$self
2351	}	3506	}
2352		3507
2353	sub toggle_flopper {	3508	sub toggle_flopper {
2354	my ($self) = @_;	3509	my ($self) = @_;
2355		3510
2356	# TODO: use animation	3511	$self->{other}->toggle_visibility;
2357	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");
2361	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");
2364	}
2365
2366	$self->emit (changed => $self->{state});
2367	}	3512	}
2368		3513
2369	#############################################################################	3514	#############################################################################
2370		3515
2371	package CFClient::UI::Tooltip;	3516	package CFPlus::UI::Tooltip;
2372		3517
2373	our @ISA = CFClient::UI::Bin::;	3518	our @ISA = CFPlus::UI::Bin::;
2374		3519
2375	use CFClient::OpenGL;	3520	use CFPlus::OpenGL;
2376		3521
2377	sub new {	3522	sub new {
2378	my $class = shift;	3523	my $class = shift;
2379		3524
2380	$class->SUPER::new (	3525	$class->SUPER::new (
…		…
2384	}	3529	}
2385		3530
2386	sub set_tooltip_from {	3531	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	3532	my ($self, $widget) = @_;
2388		3533
		3534	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3535	if $widget->{tooltip} =~ /^#(.*)$/;
		3536
		3537	my $tooltip = $widget->{tooltip};
		3538
		3539	if ($ENV{CFPLUS_DEBUG} & 2) {
		3540	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3541	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3542	. "req $widget->{req_w} $widget->{req_h}\n"
		3543	. "visible $widget->{visible}";
		3544	}
		3545
		3546	$tooltip =~ s/^\n+//;
		3547	$tooltip =~ s/\n+$//;
		3548
2389	$self->add (new CFClient::UI::Label	3549	$self->add (new CFPlus::UI::Label
2390	markup => $widget->{tooltip},	3550	markup => $tooltip,
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3551	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	3552	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	3553	style => 1, # FLAG_INVERSE
		3554	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	3555	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	3556	);
2396	}	3557	}
2397		3558
2398	sub size_request {	3559	sub size_request {
2399	my ($self) = @_;	3560	my ($self) = @_;
…		…
2401	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3562	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2402		3563
2403	($w + 4, $h + 4)	3564	($w + 4, $h + 4)
2404	}	3565	}
2405		3566
2406	sub size_allocate {	3567	sub invoke_size_allocate {
2407	my ($self, $w, $h) = @_;	3568	my ($self, $w, $h) = @_;
2408		3569
2409	$self->SUPER::size_allocate ($w - 4, $h - 4);	3570	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3571	}
		3572
		3573	sub invoke_visibility_change {
		3574	my ($self, $visible) = @_;
		3575
		3576	return unless $visible;
		3577
		3578	$self->{root}->on_post_alloc ("move_$self" => sub {
		3579	my $widget = $self->{owner}
		3580	or return;
		3581
		3582	if ($widget->{visible}) {
		3583	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3584
		3585	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3586	if $x + $self->{w} > $self->{root}{w};
		3587
		3588	$self->move_abs ($x, $y);
		3589	} else {
		3590	$self->hide;
		3591	}
		3592	});
2410	}	3593	}
2411		3594
2412	sub _draw {	3595	sub _draw {
2413	my ($self) = @_;	3596	my ($self) = @_;
2414		3597
2415	glTranslate 0.375, 0.375;	3598	glTranslate 0.375, 0.375;
2416		3599
2417	my ($w, $h) = @$self{qw(w h)};	3600	my ($w, $h) = @$self{qw(w h)};
2418		3601
2419	glColor 1, 0.8, 0.4;	3602	glColor 1, 0.8, 0.4;
2420	glBegin GL_QUADS;	3603	glRect 0, 0, $w, $h;
2421	glVertex 0 , 0;
2422	glVertex 0 , $h;
2423	glVertex $w, $h;
2424	glVertex $w, 0;
2425	glEnd;
2426		3604
2427	glColor 0, 0, 0;	3605	glColor 0, 0, 0;
2428	glBegin GL_LINE_LOOP;	3606	glRect_lineloop 0, 0, $w, $h;
2429	glVertex 0 , 0;
2430	glVertex 0 , $h;
2431	glVertex $w, $h;
2432	glVertex $w, 0;
2433	glEnd;
2434		3607
2435	glTranslate 2 - 0.375, 2 - 0.375;	3608	glTranslate 2 - 0.375, 2 - 0.375;
		3609
2436	$self->SUPER::_draw;	3610	$self->SUPER::_draw;
2437	}	3611	}
2438		3612
2439	#############################################################################	3613	#############################################################################
2440		3614
2441	package CFClient::UI::Face;	3615	package CFPlus::UI::Face;
2442		3616
2443	our @ISA = CFClient::UI::Base::;	3617	our @ISA = CFPlus::UI::DrawBG::;
2444		3618
2445	use CFClient::OpenGL;	3619	use CFPlus::OpenGL;
2446		3620
2447	sub new {	3621	sub new {
2448	my $class = shift;	3622	my $class = shift;
2449		3623
2450	$class->SUPER::new (	3624	my $self = $class->SUPER::new (
		3625	size_w => 32,
		3626	size_h => 8,
2451	aspect => 1,	3627	aspect => 1,
		3628	can_events => 0,
2452	@_,	3629	@_,
2453	)	3630	);
		3631
		3632	if ($self->{anim} && $self->{animspeed}) {
		3633	CFPlus::weaken (my $widget = $self);
		3634
		3635	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3636	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
		3637	$self->{timer} = Event->timer (
		3638	parked => 1,
		3639	cb => sub {
		3640	return unless $::CONN;
		3641
		3642	my $w = $widget
		3643	or return;
		3644
		3645	++$w->{frame};
		3646	$w->update_face;
		3647
		3648	# somehow, $widget can go away
		3649	$w->update;
		3650	$w->update_timer;
		3651	},
		3652	);
		3653
		3654	$self->update_face;
		3655	$self->update_timer;
		3656	}
		3657
		3658	$self
		3659	}
		3660
		3661	sub update_timer {
		3662	my ($self) = @_;
		3663
		3664	return unless $self->{timer};
		3665
		3666	if ($self->{visible}) {
		3667	$self->{timer}->at (
		3668	$self->{anim_start}
		3669	+ $self->{animspeed}
		3670	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3671	);
		3672	$self->{timer}->start;
		3673	} else {
		3674	$self->{timer}->stop;
		3675	}
		3676	}
		3677
		3678	sub update_face {
		3679	my ($self) = @_;
		3680
		3681	if ($::CONN) {
		3682	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3683	if ($anim && @$anim) {
		3684	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3685	delete $self->{face_change_cb};
		3686
		3687	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3688	unless ($tex->{name} || $tex->{loading}) {
		3689	$tex->upload (sub { $self->reconfigure });
		3690	}
		3691	}
		3692	}
		3693	}
		3694	}
2454	}	3695	}
2455		3696
2456	sub size_request {	3697	sub size_request {
2457	(32, 8)	3698	my ($self) = @_;
		3699
		3700	if ($::CONN) {
		3701	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3702	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3703	if ($tex->{name}) {
		3704	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3705	} elsif (!$tex->{loading}) {
		3706	$tex->upload (sub { $self->reconfigure });
		3707	}
		3708	}
		3709
		3710	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3711	}
		3712	}
		3713
		3714	($self->{size_w} || 8, $self->{size_h} || 8)
		3715	}
		3716
		3717	sub update {
		3718	my ($self) = @_;
		3719
		3720	return unless $self->{visible};
		3721
		3722	$self->SUPER::update;
		3723	}
		3724
		3725	sub invoke_visibility_change {
		3726	my ($self) = @_;
		3727
		3728	$self->update_timer;
		3729
		3730	0
2458	}	3731	}
2459		3732
2460	sub _draw {	3733	sub _draw {
2461	my ($self) = @_;	3734	my ($self) = @_;
2462		3735
2463	return unless $::CONN;#d# manage and cache textures differently	3736	$self->SUPER::_draw;
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2465		3737
2466	# TODO animation	3738	if (my $tex = $self->{tex}) {
2467	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	3739	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3740	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	3741	glColor 0, 0, 0, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3742	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	3743	glDisable GL_TEXTURE_2D;
2473	}	3744	}
2474	}	3745	}
2475		3746
		3747	sub destroy {
		3748	my ($self) = @_;
		3749
		3750	(delete $self->{timer})->cancel
		3751	if $self->{timer};
		3752
		3753	$self->SUPER::destroy;
		3754	}
		3755
2476	#############################################################################	3756	#############################################################################
2477		3757
2478	package CFClient::UI::InventoryItem;	3758	package CFPlus::UI::Buttonbar;
2479		3759
2480	our @ISA = CFClient::UI::HBox::;	3760	our @ISA = CFPlus::UI::HBox::;
2481		3761
2482	sub new {	3762	# TODO: should actually wrap buttons and other goodies.
2483	my $class = shift;
2484
2485	my %args = @_;
2486
2487	my $item = delete $args{item};
2488
2489	my $desc = $item->{nrof} < 2
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493
2494	my $self = $class->SUPER::new (
2495	can_hover => 1,
2496	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;
2501
2502	# todo: maybe put examine on 1? but should just be a tooltip :(
2503	if ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518	],
2519	)->popup ($ev);
2520	}
2521
2522	1
2523	},
2524	%args
2525	);
2526
2527	$self->add (new CFClient::UI::Face
2528	can_events => 0,
2529	face => $item->{face},
2530	anim => $item->{anim},
2531	animspeed => $item->{animspeed},
2532	);
2533
2534	$self->add (new CFClient::UI::Label
2535	can_events => 0,
2536	text => $desc,
2537	);
2538
2539	$self
2540	}
2541		3763
2542	#############################################################################	3764	#############################################################################
2543		3765
2544	package CFClient::UI::Inventory;
2545
2546	our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548	sub new {
2549	my $class = shift;
2550
2551	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),
2553	@_,
2554	);
2555
2556	$self
2557	}
2558
2559	sub set_items {
2560	my ($self, $items) = @_;
2561
2562	$self->{scrolled}->clear;
2563	return unless $items;
2564
2565	my @items = sort {
2566	($a->{type} <=> $b->{type})
2567	or ($a->{name} cmp $b->{name})
2568	} @$items;
2569
2570	$self->{real_items} = \@items;
2571
2572	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578	}
2579
2580	$self->{scrolled}->add (@items);
2581
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}
2584
2585	sub size_request {
2586	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});
2588	}
2589
2590	#############################################################################
2591
2592	package CFClient::UI::Menu;	3766	package CFPlus::UI::Menu;
2593		3767
2594	our @ISA = CFClient::UI::FancyFrame::;	3768	our @ISA = CFPlus::UI::Toplevel::;
2595		3769
2596	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
2597		3771
2598	sub new {	3772	sub new {
2599	my $class = shift;	3773	my $class = shift;
2600		3774
2601	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
2602	items => [],	3776	items => [],
2603	z => 100,	3777	z => 100,
2604	@_,	3778	@_,
2605	);	3779	);
2606		3780
2607	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3781	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2608		3782
2609	for my $item (@{ $self->{items} }) {	3783	for my $item (@{ $self->{items} }) {
2610	my ($widget, $cb) = @$item;	3784	my ($widget, $cb, $tooltip) = @$item;
2611		3785
2612	# handle various types of items, only text for now	3786	# handle various types of items, only text for now
2613	if (!ref $widget) {	3787	if (!ref $widget) {
		3788	if ($widget =~ /\t/) {
		3789	my ($left, $right) = split /\t/, $widget, 2;
		3790
2614	$widget = new CFClient::UI::Label	3791	$widget = new CFPlus::UI::HBox
2615	can_hover => 1,	3792	can_hover => 1,
2616	can_events => 1,	3793	can_events => 1,
		3794	tooltip => $tooltip,
		3795	children => [
		3796	(new CFPlus::UI::Label markup => $left, expand => 1),
		3797	(new CFPlus::UI::Label markup => $right, align => +1),
		3798	],
		3799	;
		3800
		3801	} else {
		3802	$widget = new CFPlus::UI::Label
		3803	can_hover => 1,
		3804	can_events => 1,
2617	text => $widget;	3805	markup => $widget,
		3806	tooltip => $tooltip;
		3807	}
2618	}	3808	}
2619		3809
2620	$self->{item}{$widget} = $item;	3810	$self->{item}{$widget} = $item;
2621		3811
2622	$self->{vbox}->add ($widget);	3812	$self->{vbox}->add ($widget);
…		…
2634	# maybe save $GRAB? must be careful about events...	3824	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	3825	$GRAB = $self;
2636	$self->{button} = $ev->{button};	3826	$self->{button} = $ev->{button};
2637		3827
2638	$self->show;	3828	$self->show;
2639	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3829	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640	}	3830	}
2641		3831
2642	sub mouse_motion {	3832	sub invoke_mouse_motion {
2643	my ($self, $ev, $x, $y) = @_;	3833	my ($self, $ev, $x, $y) = @_;
2644		3834
2645	# TODO: should use vbox->find_widget or so	3835	# TODO: should use vbox->find_widget or so
2646	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3836	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647	$self->{hover} = $self->{item}{$HOVER};	3837	$self->{hover} = $self->{item}{$HOVER};
2648	}
2649		3838
		3839	0
		3840	}
		3841
2650	sub button_up {	3842	sub invoke_button_up {
2651	my ($self, $ev, $x, $y) = @_;	3843	my ($self, $ev, $x, $y) = @_;
2652		3844
2653	if ($ev->{button} == $self->{button}) {	3845	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	3846	undef $GRAB;
2655	$self->hide;	3847	$self->hide;
2656		3848
2657	$self->emit ("popdown");	3849	$self->emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	3850	$self->{hover}[1]->() if $self->{hover};
		3851	} else {
		3852	return 0
		3853	}
		3854
2659	}	3855	1
2660	}	3856	}
2661		3857
2662	#############################################################################	3858	#############################################################################
2663		3859
2664	package CFClient::UI::Statusbox;	3860	package CFPlus::UI::Multiplexer;
2665		3861
		3862	our @ISA = CFPlus::UI::Container::;
		3863
		3864	sub new {
		3865	my $class = shift;
		3866
		3867	my $self = $class->SUPER::new (
		3868	@_,
		3869	);
		3870
		3871	$self->{current} = $self->{children}[0]
		3872	if @{ $self->{children} };
		3873
		3874	$self
		3875	}
		3876
		3877	sub add {
		3878	my ($self, @widgets) = @_;
		3879
		3880	$self->SUPER::add (@widgets);
		3881
		3882	$self->{current} = $self->{children}[0]
		3883	if @{ $self->{children} };
		3884	}
		3885
		3886	sub get_current_page {
		3887	my ($self) = @_;
		3888
		3889	$self->{current}
		3890	}
		3891
		3892	sub set_current_page {
		3893	my ($self, $page_or_widget) = @_;
		3894
		3895	my $widget = ref $page_or_widget
		3896	? $page_or_widget
		3897	: $self->{children}[$page_or_widget];
		3898
		3899	$self->{current} = $widget;
		3900	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3901
		3902	$self->emit (page_changed => $self->{current});
		3903
		3904	$self->realloc;
		3905	}
		3906
		3907	sub visible_children {
		3908	$_[0]{current}
		3909	}
		3910
		3911	sub size_request {
		3912	my ($self) = @_;
		3913
		3914	$self->{current}->size_request
		3915	}
		3916
		3917	sub invoke_size_allocate {
		3918	my ($self, $w, $h) = @_;
		3919
		3920	$self->{current}->configure (0, 0, $w, $h);
		3921
		3922	1
		3923	}
		3924
		3925	sub _draw {
		3926	my ($self) = @_;
		3927
		3928	$self->{current}->draw;
		3929	}
		3930
		3931	#############################################################################
		3932
		3933	package CFPlus::UI::Notebook;
		3934
2666	our @ISA = CFClient::UI::VBox::;	3935	our @ISA = CFPlus::UI::VBox::;
		3936
		3937	sub new {
		3938	my $class = shift;
		3939
		3940	my $self = $class->SUPER::new (
		3941	buttonbar => (new CFPlus::UI::Buttonbar),
		3942	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3943	# filter => # will be put between multiplexer and $self
		3944	@_,
		3945	);
		3946
		3947	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3948	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3949
		3950	{
		3951	Scalar::Util::weaken (my $wself = $self);
		3952
		3953	$self->{multiplexer}->connect (c_add => sub {
		3954	my ($mplex, $widgets) = @_;
		3955
		3956	for my $child (@$widgets) {
		3957	Scalar::Util::weaken $child;
		3958	$child->{c_tab_} ||= do {
		3959	my $tab =
		3960	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3961	? $child->{c_tab}
		3962	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3963
		3964	$tab->connect (activate => sub {
		3965	$wself->set_current_page ($child);
		3966	});
		3967
		3968	$tab
		3969	};
		3970
		3971	$self->{buttonbar}->add ($child->{c_tab_});
		3972	}
		3973	});
		3974
		3975	$self->{multiplexer}->connect (c_remove => sub {
		3976	my ($mplex, $widgets) = @_;
		3977
		3978	for my $child (@$widgets) {
		3979	$wself->{buttonbar}->remove ($child->{c_tab_});
		3980	}
		3981	});
		3982	}
		3983
		3984	$self
		3985	}
		3986
		3987	sub add {
		3988	my ($self, @widgets) = @_;
		3989
		3990	$self->{multiplexer}->add (@widgets)
		3991	}
		3992
		3993	sub remove {
		3994	my ($self, @widgets) = @_;
		3995
		3996	$self->{multiplexer}->remove (@widgets)
		3997	}
		3998
		3999	sub pages {
		4000	my ($self) = @_;
		4001	$self->{multiplexer}->children
		4002	}
		4003
		4004	sub add_tab {
		4005	my ($self, $title, $widget, $tooltip) = @_;
		4006
		4007	$title = [$title, $tooltip] unless ref $title;
		4008	$widget->{c_tab} = $title;
		4009
		4010	$self->add ($widget);
		4011	}
		4012
		4013	sub get_current_page {
		4014	my ($self) = @_;
		4015
		4016	$self->{multiplexer}->get_current_page
		4017	}
		4018
		4019	sub set_current_page {
		4020	my ($self, $page) = @_;
		4021
		4022	$self->{multiplexer}->set_current_page ($page);
		4023	$self->emit (page_changed => $self->{multiplexer}{current});
		4024	}
		4025
		4026	#############################################################################
		4027
		4028	package CFPlus::UI::Selector;
		4029
		4030	use utf8;
		4031
		4032	our @ISA = CFPlus::UI::Button::;
		4033
		4034	sub new {
		4035	my $class = shift;
		4036
		4037	my $self = $class->SUPER::new (
		4038	options => [], # [value, title, longdesc], ...
		4039	value => undef,
		4040	@_,
		4041	);
		4042
		4043	$self->_set_value ($self->{value});
		4044
		4045	$self
		4046	}
		4047
		4048	sub invoke_button_down {
		4049	my ($self, $ev) = @_;
		4050
		4051	my @menu_items;
		4052
		4053	for (@{ $self->{options} }) {
		4054	my ($value, $title, $tooltip) = @$_;
		4055
		4056	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		4057	}
		4058
		4059	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		4060	}
		4061
		4062	sub _set_value {
		4063	my ($self, $value) = @_;
		4064
		4065	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		4066	or return;
		4067
		4068	$self->{value} = $item->[0];
		4069	$self->set_markup ("$item->[1] ⇓");
		4070	$self->set_tooltip ($item->[2]);
		4071	}
		4072
		4073	sub set_value {
		4074	my ($self, $value) = @_;
		4075
		4076	return unless $self->{value} ne $value;
		4077
		4078	$self->_set_value ($value);
		4079	$self->emit (changed => $value);
		4080	}
		4081
		4082	#############################################################################
		4083
		4084	package CFPlus::UI::Statusbox;
		4085
		4086	our @ISA = CFPlus::UI::VBox::;
		4087
		4088	sub new {
		4089	my $class = shift;
		4090
		4091	my $self = $class->SUPER::new (
		4092	fontsize => 0.8,
		4093	@_,
		4094	);
		4095
		4096	CFPlus::weaken (my $this = $self);
		4097
		4098	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		4099
		4100	$self
		4101	}
2667		4102
2668	sub reorder {	4103	sub reorder {
2669	my ($self) = @_;	4104	my ($self) = @_;
2670	my $NOW = time;	4105	my $NOW = Time::HiRes::time;
		4106
		4107	# freeze display when hovering over any label
		4108	return if $CFPlus::UI::TOOLTIP->{owner}
		4109	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		4110	values %{ $self->{item} };
2671		4111
2672	while (my ($k, $v) = each %{ $self->{item} }) {	4112	while (my ($k, $v) = each %{ $self->{item} }) {
2673	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4113	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674	}	4114	}
2675		4115
…		…
2678	my @items = sort {	4118	my @items = sort {
2679	$a->{pri} <=> $b->{pri}	4119	$a->{pri} <=> $b->{pri}
2680	or $b->{id} <=> $a->{id}	4120	or $b->{id} <=> $a->{id}
2681	} values %{ $self->{item} };	4121	} values %{ $self->{item} };
2682		4122
		4123	$self->{timer}->interval (1);
		4124
2683	my $count = 10 + 1;	4125	my $count = 10 + 1;
2684	for my $item (@items) {	4126	for my $item (@items) {
2685	last unless --$count;	4127	last unless --$count;
2686		4128
2687	push @widgets, $item->{label} ||= do {	4129	my $label = $item->{label} ||= do {
2688	# TODO: doesn't handle markup well (read as: at all)	4130	# TODO: doesn't handle markup well (read as: at all)
2689	my $short = $item->{count} > 1	4131	my $short = $item->{count} > 1
2690	? "<b>$item->{count} ×</b> $item->{text}"	4132	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	4133	: $item->{text};
2692		4134
2693	for ($short) {	4135	for ($short) {
2694	s/^\s+//;	4136	s/^\s+//;
2695	s/\012.*/…/s;	4137	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	4138	}
2699		4139
2700	new CFClient::UI::Label	4140	new CFPlus::UI::Label
2701	markup => $short,	4141	markup => $short,
2702	tooltip => $item->{tooltip},	4142	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	4143	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	4144	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	4145	fontsize => $item->{fontsize} || $self->{fontsize},
2706	color => $item->{color},	4146	max_w => $::WIDTH * 0.44,
		4147	fg => [@{ $item->{fg} }],
2707	can_events => 1,	4148	can_events => 1,
2708	can_hover => 1	4149	can_hover => 1
2709	};	4150	};
		4151
		4152	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		4153	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		4154	$label->update;
		4155	$label->set_max_size (undef, $label->{req_h} * $diff)
		4156	if $diff < 1;
		4157	$self->{timer}->interval (1/30);
		4158	} else {
		4159	$label->{fg}[3] = $item->{fg}[3] || 1;
		4160	}
		4161
		4162	push @widgets, $label;
2710	}	4163	}
2711		4164
2712	$self->clear;	4165	$self->clear;
2713	$self->SUPER::add (reverse @widgets);	4166	$self->SUPER::add (reverse @widgets);
2714	}	4167	}
…		…
2717	my ($self, $text, %arg) = @_;	4170	my ($self, $text, %arg) = @_;
2718		4171
2719	$text =~ s/^\s+//;	4172	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	4173	$text =~ s/\s+$//;
2721		4174
		4175	return unless $text;
		4176
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	4177	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2723		4178
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	4179	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		4180
2726	if (my $item = $self->{item}{$group}) {	4181	if (my $item = $self->{item}{$group}) {
2727	if ($item->{text} eq $text) {	4182	if ($item->{text} eq $text) {
2728	$item->{count}++;	4183	$item->{count}++;
2729	} else {	4184	} else {
2730	$item->{count} = 1;	4185	$item->{count} = 1;
2731	$item->{text} = $item->{tooltip} = $text;	4186	$item->{text} = $item->{tooltip} = $text;
2732	}	4187	}
2733	$item->{id} = ++$self->{id};	4188	$item->{id} += 0.2;#d#
2734	$item->{timeout} = $timeout;	4189	$item->{timeout} = $timeout;
2735	delete $item->{label};	4190	delete $item->{label};
2736	} else {	4191	} else {
2737	$self->{item}{$group} = {	4192	$self->{item}{$group} = {
2738	id => ++$self->{id},	4193	id => ++$self->{id},
2739	text => $text,	4194	text => $text,
2740	timeout => $timeout,	4195	timeout => $timeout,
2741	tooltip => $text,	4196	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	4197	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	4198	pri => 0,
2745	count => 1,	4199	count => 1,
2746	%arg,	4200	%arg,
2747	};	4201	};
2748	}	4202	}
2749		4203
		4204	$ROOT->on_refresh (reorder => sub {
		4205	$self->reorder;
		4206	});
		4207	}
		4208
		4209	sub reconfigure {
		4210	my ($self) = @_;
		4211
		4212	delete $_->{label}
		4213	for values %{ $self->{item} || {} };
		4214
2750	$self->reorder;	4215	$self->reorder;
		4216	$self->SUPER::reconfigure;
		4217	}
		4218
		4219	sub destroy {
		4220	my ($self) = @_;
		4221
		4222	$self->{timer}->cancel;
		4223
		4224	$self->SUPER::destroy;
2751	}	4225	}
2752		4226
2753	#############################################################################	4227	#############################################################################
2754		4228
2755	package CFClient::UI::Root;	4229	package CFPlus::UI::Root;
2756		4230
2757	our @ISA = CFClient::UI::Container::;	4231	our @ISA = CFPlus::UI::Container::;
2758		4232
		4233	use List::Util qw(min max);
		4234
2759	use CFClient::OpenGL;	4235	use CFPlus::OpenGL;
2760		4236
2761	sub new {	4237	sub new {
2762	my $class = shift;	4238	my $class = shift;
2763		4239
2764	$class->SUPER::new (	4240	my $self = $class->SUPER::new (
		4241	visible => 1,
2765	@_,	4242	@_,
2766	)	4243	);
2767	}
2768		4244
2769	sub configure {	4245	CFPlus::weaken ($self->{root} = $self);
2770	my ($self, $x, $y, $w, $h) = @_;
2771		4246
2772	$self->{w} = $w;	4247	$self
2773	$self->{h} = $h;
2774	}
2775
2776	sub check_size {
2777	my ($self) = @_;
2778
2779	$self->size_allocate ($self->{w}, $self->{h})
2780	if $self->{w};
2781	}	4248	}
2782		4249
2783	sub size_request {	4250	sub size_request {
2784	my ($self) = @_;	4251	my ($self) = @_;
2785		4252
2786	($self->{w}, $self->{h})	4253	($self->{w}, $self->{h})
2787	}	4254	}
2788		4255
		4256	sub _to_pixel {
		4257	my ($coord, $size, $max) = @_;
		4258
		4259	$coord =
		4260	$coord eq "center" ? ($max - $size) * 0.5
		4261	: $coord eq "max" ? $max
		4262	: $coord;
		4263
		4264	$coord = 0 if $coord < 0;
		4265	$coord = $max - $size if $coord > $max - $size;
		4266
		4267	int $coord + 0.5
		4268	}
		4269
2789	sub size_allocate {	4270	sub invoke_size_allocate {
2790	my ($self, $w, $h) = @_;	4271	my ($self, $w, $h) = @_;
2791
2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797		4272
2798	for my $child ($self->children) {	4273	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4274	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		4275
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	4276	$X = $child->{force_x} if exists $child->{force_x};
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	4277	$Y = $child->{force_y} if exists $child->{force_y};
		4278
		4279	$X = _to_pixel $X, $W, $self->{w};
		4280	$Y = _to_pixel $Y, $H, $self->{h};
		4281
2803	$child->configure ($X, $Y, $W, $H);	4282	$child->configure ($X, $Y, $W, $H);
2804	}	4283	}
		4284
		4285	1
2805	}	4286	}
2806		4287
2807	sub coord2local {	4288	sub coord2local {
2808	my ($self, $x, $y) = @_;	4289	my ($self, $x, $y) = @_;
2809		4290
…		…
2817	}	4298	}
2818		4299
2819	sub update {	4300	sub update {
2820	my ($self) = @_;	4301	my ($self) = @_;
2821		4302
2822	$self->check_size;
2823	$::WANT_REFRESH++;	4303	$::WANT_REFRESH->start;
2824	}	4304	}
2825		4305
2826	sub add {	4306	sub add {
2827	my ($self, @children) = @_;	4307	my ($self, @children) = @_;
2828		4308
2829	for my $child (@children) {
2830	$child->{toplevel} = 1;	4309	$_->{is_toplevel} = 1
2831		4310	for @children;
2832	# integerise window positions
2833	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};
2835	}
2836		4311
2837	$self->SUPER::add (@children);	4312	$self->SUPER::add (@children);
		4313	}
		4314
		4315	sub remove {
		4316	my ($self, @children) = @_;
		4317
		4318	$self->SUPER::remove (@children);
		4319
		4320	delete $self->{is_toplevel}
		4321	for @children;
		4322
		4323	while (@children) {
		4324	my $w = pop @children;
		4325	push @children, $w->children;
		4326	$w->set_invisible;
		4327	}
2838	}	4328	}
2839		4329
2840	sub on_refresh {	4330	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	4331	my ($self, $id, $cb) = @_;
2842		4332
…		…
2855	while ($self->{refresh_hook}) {	4345	while ($self->{refresh_hook}) {
2856	$_->()	4346	$_->()
2857	for values %{delete $self->{refresh_hook}};	4347	for values %{delete $self->{refresh_hook}};
2858	}	4348	}
2859		4349
2860	if ($self->{check_size}) {	4350	while ($self->{realloc}) {
2861	my @queue = ([], []);	4351	my %queue;
		4352	my @queue;
		4353	my $widget;
2862		4354
2863	for (;;) {	4355	outer:
2864	if ($self->{check_size}) {	4356	while () {
2865	# heuristic: check containers last	4357	if (my $realloc = delete $self->{realloc}) {
2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	4358	for $widget (values %$realloc) {
2867	for values %{delete $self->{check_size}}	4359	$widget->{visible} or next; # do not resize invisible widgets
		4360
		4361	$queue{$widget+0}++ and next; # duplicates are common
		4362
		4363	push @{ $queue[$widget->{visible}] }, $widget;
		4364	}
2868	}	4365	}
2869		4366
2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	4367	while () {
		4368	@queue or last outer;
2871		4369
2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	4370	$widget = pop @{ $queue[-1] || [] }
2873	? @$widget{qw(user_w user_h)}	4371	and last;
2874	: $widget->size_request;
2875
2876	if (delete $widget->{force_alloc}
2877	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879		4372
		4373	pop @queue;
		4374	}
		4375
		4376	delete $queue{$widget+0};
		4377
		4378	my ($w, $h) = $widget->size_request;
		4379
		4380	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		4381	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4382
		4383	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4384	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4385
		4386	$w = $widget->{force_w} if exists $widget->{force_w};
		4387	$h = $widget->{force_h} if exists $widget->{force_h};
		4388
		4389	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4390	|| delete $widget->{force_realloc}) {
2880	$widget->{req_w} = $w;	4391	$widget->{req_w} = $w;
2881	$widget->{req_h} = $h;	4392	$widget->{req_h} = $h;
2882		4393
2883	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	4394	$self->{size_alloc}{$widget+0} = $widget;
2884		4395
2885	$widget->{parent}->check_size
2886	if $widget->{parent};	4396	if (my $parent = $widget->{parent}) {
		4397	$self->{realloc}{$parent+0} = $parent
		4398	unless $queue{$parent+0};
		4399
		4400	$parent->{force_size_alloc} = 1;
		4401	$self->{size_alloc}{$parent+0} = $parent;
		4402	}
2887	}	4403	}
		4404
		4405	delete $self->{realloc}{$widget+0};
2888	}	4406	}
2889	}
2890		4407
2891	while ($self->{size_alloc}) {	4408	while (my $size_alloc = delete $self->{size_alloc}) {
2892	for (values %{delete $self->{size_alloc}}) {	4409	my @queue = sort { $a->{visible} <=> $b->{visible} }
2893	my ($widget, $w, $h) = @$_;	4410	values %$size_alloc;
2894		4411
		4412	while () {
		4413	my $widget = pop @queue || last;
		4414
		4415	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
		4416
		4417	$w = max $widget->{min_w}, $w;
		4418	$h = max $widget->{min_h}, $h;
		4419
		4420	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4421	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4422
		4423	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4424	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4425
2895	$w = 0 if $w < 0;	4426	$w = int $w + 0.5;
2896	$h = 0 if $h < 0;	4427	$h = int $h + 0.5;
2897		4428
		4429	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4430	$widget->{old_w} = $widget->{w};
		4431	$widget->{old_h} = $widget->{h};
		4432
2898	$widget->{w} = $w;	4433	$widget->{w} = $w;
2899	$widget->{h} = $h;	4434	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);	4435
2901	$widget->emit (size_allocate => $w, $h);	4436	$widget->emit (size_allocate => $w, $h);
		4437	}
		4438	}
2902	}	4439	}
2903	}	4440	}
2904		4441
2905	while ($self->{post_alloc_hook}) {	4442	while ($self->{post_alloc_hook}) {
2906	$_->()	4443	$_->()
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4448	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	4449	glClear GL_COLOR_BUFFER_BIT;
2913		4450
2914	glMatrixMode GL_PROJECTION;	4451	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	4452	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	4453	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	4454	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	4455	glLoadIdentity;
2919		4456
		4457	{
		4458	package CFPlus::UI::Base;
		4459
		4460	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4461	(0, 0, $self->{w}, $self->{h});
		4462
2920	$self->_draw;	4463	$self->_draw;
		4464	}
2921	}	4465	}
2922		4466
2923	#############################################################################	4467	#############################################################################
2924		4468
2925	package CFClient::UI;	4469	package CFPlus::UI;
2926		4470
2927	$ROOT = new CFClient::UI::Root;	4471	$ROOT = new CFPlus::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	4472	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2929		4473
2930	1	4474	1
2931		4475

Diff Legend

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