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

Diff Legend

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