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

Diff Legend

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