ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

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

Diff Legend

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