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

Diff Legend

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