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

Diff Legend

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