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

Diff Legend

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