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

Diff Legend

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