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

Diff Legend

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