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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

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

Diff Legend

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