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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

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

Diff Legend

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