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

Diff Legend

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