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.263 by elmex, Wed May 31 14:04:52 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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
881	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
882	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
883		993
		994	$self->emit (changed => $self->{view_x}, $self->{view_y});
884	$self->update;	995	$self->update;
885	}	996	}
886		997
887	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
888	sub coord2local {	999	sub coord2local {
…		…
906	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
908	) {	1019	) {
909	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910	} else {	1021	} else {
911	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
912	}	1023	}
913	}	1024	}
914		1025
915	sub _render {	1026	sub _render {
916	my ($self) = @_;	1027	my ($self) = @_;
917		1028
		1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1031
918	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919		1033
920	$self->SUPER::_render;	1034	$self->SUPER::_render;
921	}	1035	}
922		1036
923	#############################################################################	1037	#############################################################################
924		1038
925	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
926		1040
927	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
928		1042
929	sub new {	1043	sub new {
930	my $class = shift;	1044	my ($class, %arg) = @_;
		1045
		1046	my $child = delete $arg{child};
931		1047
932	my $self;	1048	my $self;
933		1049
934	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
935	vertical => 1,	1060	vertical => 1,
936	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
937	on_changed => sub {	1062	on_changed => sub {
938	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
939	},	1065	},
940	;	1066	;
941		1067
942	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
943	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
944	slider => $slider,	1072	hslider => $hslider,
945	@_,	1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
		1076	%arg,
946	);	1077	);
947		1078
948	$self->{vp}->add ($self->{scrolled});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085	$vp->{parent}{hslider}->set_value ($x);
		1086	$vp->{parent}{vslider}->set_value ($y);
		1087
		1088	0
		1089	},
		1090	;
		1091
949	$self->add ($self->{vp});	1092	$self->SUPER::add (0, 0, $self->{vp});
950	$self->add ($self->{slider});	1093
		1094	$self->add ($child) if $child;
951		1095
952	$self	1096	$self
953	}	1097	}
954		1098
		1099	#TODO# update range on size_allocate depending on child
		1100
		1101	sub add {
		1102	my ($self, $widget) = @_;
		1103
		1104	$self->{vp}->add ($self->{child} = $widget);
		1105	}
		1106
		1107	sub update_slider {
		1108	my ($self) = @_;
		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
		1129	}
		1130
955	sub update {	1131	sub update {
956	my ($self) = @_;	1132	my ($self) = @_;
957		1133
958	$self->SUPER::update;	1134	$self->SUPER::update;
959		1135	$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	}	1136	}
964		1137
		1138	sub invoke_mouse_wheel {
		1139	my ($self, $ev) = @_;
		1140
		1141	return 0 unless $ev->{dy}; # only vertical movements for now
		1142
		1143	$self->{vslider}->emit (mouse_wheel => $ev);
		1144
		1145	1
		1146	}
		1147
		1148	sub invoke_button_down {
		1149	my ($self, $ev, $x, $y) = @_;
		1150
		1151	if ($ev->{button} == 2) {
		1152	$self->grab_focus;
		1153
		1154	my $ox = $self->{vp}{view_x} + $ev->{x};
		1155	my $oy = $self->{vp}{view_y} + $ev->{y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1161	$self->update;
		1162	};
		1163
		1164	return 1;
		1165	}
		1166
		1167	0
		1168	}
		1169
		1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
		1189	}
		1190
965	sub size_allocate {	1191	sub invoke_size_allocate {
966	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
967		1193
		1194	$self->update_slider;
968	$self->SUPER::size_allocate ($w, $h);	1195	$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	}	1196	}
973
974	#TODO# update range on size_allocate depending on child
975	# update viewport offset on scroll
976		1197
977	#############################################################################	1198	#############################################################################
978		1199
979	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
980		1201
981	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
982		1203
983	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
984		1205
985	sub new {	1206	sub new {
986	my $class = shift;	1207	my $class = shift;
987		1208
988	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
996		1217
997	if ($self->{bg}) {	1218	if ($self->{bg}) {
998	my ($w, $h) = @$self{qw(w h)};	1219	my ($w, $h) = @$self{qw(w h)};
999		1220
1000	glEnable GL_BLEND;	1221	glEnable GL_BLEND;
1001	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002	glColor @{ $self->{bg} };	1223	glColor_premultiply @{ $self->{bg} };
1003		1224
1004	glBegin GL_QUADS;	1225	glBegin GL_QUADS;
1005	glVertex 0 , 0;	1226	glVertex 0 , 0;
1006	glVertex 0 , $h;	1227	glVertex 0 , $h;
1007	glVertex $w, $h;	1228	glVertex $w, $h;
…		…
1014	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1015	}	1236	}
1016		1237
1017	#############################################################################	1238	#############################################################################
1018		1239
1019	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1020		1241
1021	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1022		1243
1023	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
1024		1345
1025	my $bg =	1346	my $bg =
1026	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1028		1349
1029	my @border =	1350	my @border =
1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1351	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);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032		1353
1033	sub new {	1354	sub new {
1034	my $class = shift;	1355	my ($class, %arg) = @_;
1035		1356
1036	my $self = $class->SUPER::new (	1357	my $self = $class->SUPER::new (
1037	bg => [1, 1, 1, 1],	1358	bg => [1, 1, 1, 1],
1038	border_bg => [1, 1, 1, 1],	1359	border_bg => [1, 1, 1, 1],
1039	border => 0.6,	1360	border => 0.6,
1040	can_events => 1,	1361	can_events => 1,
1041	min_w => 16,	1362	min_w => 64,
1042	min_h => 16,	1363	min_h => 32,
1043	@_	1364	%arg,
1044	);	1365	);
1045		1366
1046	$self->{title} &&= new CFClient::UI::Label	1367	$self->{title_widget} = new CFPlus::UI::Label
1047	align => 0,	1368	align => 0,
1048	valign => 1,	1369	valign => 1,
1049	text => $self->{title},	1370	text => $self->{title},
1050	fontsize => $self->{border};	1371	fontsize => $self->{border},
		1372	if exists $self->{title};
		1373
		1374	if ($self->{has_close_button}) {
		1375	$self->{close_button} =
		1376	new CFPlus::UI::ImageButton
		1377	path => 'x1_close.png',
		1378	on_activate => sub { $self->emit ("delete") };
		1379
		1380	$self->CFPlus::UI::Container::add ($self->{close_button});
		1381	}
1051		1382
1052	$self	1383	$self
		1384	}
		1385
		1386	sub add {
		1387	my ($self, @widgets) = @_;
		1388
		1389	$self->SUPER::add (@widgets);
		1390	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1391	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053	}	1392	}
1054		1393
1055	sub border {	1394	sub border {
1056	int $_[0]{border} * $::FONTSIZE	1395	int $_[0]{border} * $::FONTSIZE
1057	}	1396	}
1058		1397
1059	sub size_request {	1398	sub size_request {
1060	my ($self) = @_;	1399	my ($self) = @_;
		1400
		1401	$self->{title_widget}->size_request
		1402	if $self->{title_widget};
		1403
		1404	$self->{close_button}->size_request
		1405	if $self->{close_button};
1061		1406
1062	my ($w, $h) = $self->SUPER::size_request;	1407	my ($w, $h) = $self->SUPER::size_request;
1063		1408
1064	(	1409	(
1065	$w + $self->border * 2,	1410	$w + $self->border * 2,
1066	$h + $self->border * 2,	1411	$h + $self->border * 2,
1067	)	1412	)
1068	}	1413	}
1069		1414
1070	sub size_allocate {	1415	sub invoke_size_allocate {
1071	my ($self, $w, $h) = @_;	1416	my ($self, $w, $h) = @_;
1072		1417
		1418	if ($self->{title_widget}) {
		1419	$self->{title_widget}{w} = $w;
		1420	$self->{title_widget}{h} = $h;
		1421	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1422	}
		1423
		1424	my $border = $self->border;
		1425
1073	$h -= List::Util::max 0, $self->border * 2;	1426	$h -= List::Util::max 0, $border * 2;
1074	$w -= List::Util::max 0, $self->border * 2;	1427	$w -= List::Util::max 0, $border * 2;
1075		1428
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);	1429	$self->child->configure ($border, $border, $w, $h);
1080	}
1081		1430
		1431	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1432	if $self->{close_button};
		1433
		1434	1
		1435	}
		1436
		1437	sub invoke_delete {
		1438	my ($self) = @_;
		1439
		1440	$self->hide;
		1441
		1442	1
		1443	}
		1444
1082	sub button_down {	1445	sub invoke_button_down {
1083	my ($self, $ev, $x, $y) = @_;	1446	my ($self, $ev, $x, $y) = @_;
1084		1447
1085	my ($w, $h) = @$self{qw(w h)};	1448	my ($w, $h) = @$self{qw(w h)};
1086	my $border = $self->border;	1449	my $border = $self->border;
1087		1450
…		…
1103	my $dy = $ev->{y} - $oy;	1466	my $dy = $ev->{y} - $oy;
1104		1467
1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1468	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1469	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107		1470
		1471	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108	$self->realloc;	1472	$self->realloc;
1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110	};	1473	};
1111		1474
1112	} elsif ($lr ^ $td) {	1475	} elsif ($lr ^ $td) {
1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1476	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114	my ($bx, $by) = ($self->{x}, $self->{y});	1477	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1117	my ($ev, $x, $y) = @_;	1480	my ($ev, $x, $y) = @_;
1118		1481
1119	($x, $y) = ($ev->{x}, $ev->{y});	1482	($x, $y) = ($ev->{x}, $ev->{y});
1120		1483
1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1484	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1485	# HACK: the next line is required to enforce placement
		1486	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122	};	1487	};
		1488	} else {
		1489	return 0;
		1490	}
		1491
1123	}	1492	1
1124	}	1493	}
1125		1494
1126	sub button_up {	1495	sub invoke_button_up {
1127	my ($self, $ev, $x, $y) = @_;	1496	my ($self, $ev, $x, $y) = @_;
1128		1497
1129	delete $self->{motion};	1498	! ! delete $self->{motion}
1130	}	1499	}
1131		1500
1132	sub mouse_motion {	1501	sub invoke_mouse_motion {
1133	my ($self, $ev, $x, $y) = @_;	1502	my ($self, $ev, $x, $y) = @_;
1134		1503
1135	$self->{motion}->($ev, $x, $y) if $self->{motion};	1504	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1505
		1506	! ! $self->{motion}
		1507	}
		1508
		1509	sub invoke_visibility_change {
		1510	my ($self, $visible) = @_;
		1511
		1512	delete $self->{motion} unless $visible;
		1513
		1514	0
1136	}	1515	}
1137		1516
1138	sub _draw {	1517	sub _draw {
1139	my ($self) = @_;	1518	my ($self) = @_;
1140		1519
		1520	my $child = $self->{children}[0];
		1521
1141	my ($w, $h ) = ($self->{w}, $self->{h});	1522	my ($w, $h ) = ($self->{w}, $self->{h});
1142	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1523	my ($cw, $ch) = ($child->{w}, $child->{h});
1143		1524
1144	glEnable GL_TEXTURE_2D;	1525	glEnable GL_TEXTURE_2D;
1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1526	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146		1527
1147	my $border = $self->border;	1528	my $border = $self->border;
…		…
1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1543	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163	}	1544	}
1164		1545
1165	glDisable GL_TEXTURE_2D;	1546	glDisable GL_TEXTURE_2D;
1166		1547
1167	$self->{title}->draw if $self->{title};
1168
1169	$self->child->draw;	1548	$child->draw;
		1549
		1550	if ($self->{title_widget}) {
		1551	glTranslate 0, $border - $self->{h};
		1552	$self->{title_widget}->_draw;
		1553
		1554	glTranslate 0, - ($border - $self->{h});
		1555	}
		1556
		1557	$self->{close_button}->draw
		1558	if $self->{close_button};
1170	}	1559	}
1171		1560
1172	#############################################################################	1561	#############################################################################
1173		1562
1174	package CFClient::UI::Table;	1563	package CFPlus::UI::Table;
1175		1564
1176	our @ISA = CFClient::UI::Base::;	1565	our @ISA = CFPlus::UI::Base::;
1177		1566
1178	use List::Util qw(max sum);	1567	use List::Util qw(max sum);
1179		1568
1180	use CFClient::OpenGL;	1569	use CFPlus::OpenGL;
1181		1570
1182	sub new {	1571	sub new {
1183	my $class = shift;	1572	my $class = shift;
1184		1573
1185	$class->SUPER::new (	1574	$class->SUPER::new (
		1575	children => [],
1186	col_expand => [],	1576	col_expand => [],
		1577	row_expand => [],
1187	@_,	1578	@_,
1188	)	1579	)
1189	}	1580	}
1190		1581
1191	sub children {	1582	sub children {
1192	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1583	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193	}	1584	}
1194		1585
		1586	# TODO: store row/col info in child widget and use standard add/del
1195	sub add {	1587	sub add {
1196	my ($self, $x, $y, $child) = @_;	1588	my ($self) = shift;
1197		1589
		1590	while (@_) {
		1591	my ($x, $y, $child) = splice @_, 0, 3, ();
1198	$child->set_parent ($self);	1592	$child->set_parent ($self);
1199	$self->{children}[$y][$x] = $child;	1593	$self->{children}[$y][$x] = $child;
		1594	}
1200		1595
		1596	$self->{force_realloc} = 1;
		1597	$self->{force_size_alloc} = 1;
1201	$self->realloc;	1598	$self->realloc;
		1599	}
		1600
		1601	sub remove {
		1602	my ($self, $child) = @_;
		1603
		1604	for (@{ $self->{children} }) {
		1605	for (@{ $_ || [] }) {
		1606	$_ = undef if $_ == $child;
		1607	}
		1608	}
1202	}	1609	}
1203		1610
1204	# TODO: move to container class maybe? send children a signal on removal?	1611	# TODO: move to container class maybe? send children a signal on removal?
1205	sub clear {	1612	sub clear {
1206	my ($self) = @_;	1613	my ($self) = @_;
…		…
1247	(sum @$ws),	1654	(sum @$ws),
1248	(sum @$hs),	1655	(sum @$hs),
1249	)	1656	)
1250	}	1657	}
1251		1658
1252	sub size_allocate {	1659	sub invoke_size_allocate {
1253	my ($self, $w, $h) = @_;	1660	my ($self, $w, $h) = @_;
1254		1661
1255	my ($ws, $hs) = $self->get_wh;	1662	my ($ws, $hs) = $self->get_wh;
1256		1663
1257	my $req_w = (sum @$ws) || 1;	1664	my $req_w = (sum @$ws) || 1;
1258	my $req_h = (sum @$hs) || 1;	1665	my $req_h = (sum @$hs) || 1;
1259		1666
1260	# TODO: nicer code && do row_expand	1667	# TODO: nicer code
1261	my @col_expand = @{$self->{col_expand}};	1668	my @col_expand = @{$self->{col_expand}};
1262	@col_expand = (1) x @$ws unless @col_expand;	1669	@col_expand = (1) x @$ws unless @col_expand;
1263	my $col_expand = (sum @col_expand) || 1;	1670	my $col_expand = (sum @col_expand) || 1;
1264		1671
1265	# linearly scale sizes
1266	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1672	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268		1673
1269	CFClient::UI::harmonize $ws;	1674	CFPlus::UI::harmonize $ws;
		1675
		1676	my @row_expand = @{$self->{row_expand}};
		1677	@row_expand = (1) x @$ws unless @row_expand;
		1678	my $row_expand = (sum @row_expand) || 1;
		1679
		1680	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1681
1270	CFClient::UI::harmonize $hs;	1682	CFPlus::UI::harmonize $hs;
1271		1683
1272	my $y;	1684	my $y;
1273		1685
1274	for my $r (0 .. $#{$self->{children}}) {	1686	for my $r (0 .. $#{$self->{children}}) {
1275	my $row = $self->{children}[$r]	1687	my $row = $self->{children}[$r]
…		…
1289	}	1701	}
1290		1702
1291	$y += $row_h;	1703	$y += $row_h;
1292	}	1704	}
1293		1705
		1706	1
1294	}	1707	}
1295		1708
1296	sub find_widget {	1709	sub find_widget {
1297	my ($self, $x, $y) = @_;	1710	my ($self, $x, $y) = @_;
1298		1711
…		…
1317	}	1730	}
1318	}	1731	}
1319		1732
1320	#############################################################################	1733	#############################################################################
1321		1734
1322	package CFClient::UI::Box;	1735	package CFPlus::UI::Fixed;
1323		1736
		1737	use List::Util qw(min max);
		1738
1324	our @ISA = CFClient::UI::Container::;	1739	our @ISA = CFPlus::UI::Container::;
		1740
		1741	sub add {
		1742	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1743
		1744	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1745	$self->SUPER::add ($child);
		1746	}
		1747
		1748	sub _scale($$$) {
		1749	my ($mode, $val, $max) = @_;
		1750
		1751	$mode eq "abs" ? $val
		1752	: $mode eq "rel" ? $val * $max
		1753	: 0
		1754	}
		1755
		1756	sub size_request {
		1757	my ($self) = @_;
		1758
		1759	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1760
		1761	# determine overall size by querying abs widgets
		1762	for my $child ($self->visible_children) {
		1763	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1764
		1765	if ($pos eq "abs") {
		1766	$w = _scale $size, $w, $child->{req_w};
		1767	$h = _scale $size, $h, $child->{req_h};
		1768
		1769	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1770	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1771	}
		1772	}
		1773
		1774	my $W = $x2 - $x1;
		1775	my $H = $y2 - $y1;
		1776
		1777	# now layout remaining widgets
		1778	for my $child ($self->visible_children) {
		1779	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1780
		1781	if ($pos ne "abs") {
		1782	$x = _scale $pos, $x, $W;
		1783	$y = _scale $pos, $x, $H;
		1784	$w = _scale $size, $w, $child->{req_w};
		1785	$h = _scale $size, $h, $child->{req_h};
		1786
		1787	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1788	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1789	}
		1790	}
		1791
		1792	my $W = $x2 - $x1;
		1793	my $H = $y2 - $y1;
		1794
		1795	($W, $H)
		1796	}
		1797
		1798	sub invoke_size_allocate {
		1799	my ($self, $W, $H) = @_;
		1800
		1801	for my $child ($self->visible_children) {
		1802	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1803
		1804	$x = _scale $pos, $x, $W;
		1805	$y = _scale $pos, $x, $H;
		1806	$w = _scale $size, $w, $child->{req_w};
		1807	$h = _scale $size, $h, $child->{req_h};
		1808
		1809	$child->configure ($x, $y, $w, $h);
		1810	}
		1811
		1812	1
		1813	}
		1814
		1815	#############################################################################
		1816
		1817	package CFPlus::UI::Box;
		1818
		1819	our @ISA = CFPlus::UI::Container::;
1325		1820
1326	sub size_request {	1821	sub size_request {
1327	my ($self) = @_;	1822	my ($self) = @_;
1328		1823
1329	$self->{vertical}	1824	$self->{vertical}
…		…
1335	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1830	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1831	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1337	)	1832	)
1338	}	1833	}
1339		1834
1340	sub size_allocate {	1835	sub invoke_size_allocate {
1341	my ($self, $w, $h) = @_;	1836	my ($self, $w, $h) = @_;
1342		1837
1343	my $space = $self->{vertical} ? $h : $w;	1838	my $space = $self->{vertical} ? $h : $w;
1344	my $children = $self->{children};	1839	my @children = $self->visible_children;
1345		1840
1346	my @req;	1841	my @req;
1347		1842
1348	if ($self->{homogeneous}) {	1843	if ($self->{homogeneous}) {
1349	@req = ($space / (@$children || 1)) x @$children;	1844	@req = ($space / (@children || 1)) x @children;
1350	} else {	1845	} else {
1351	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1846	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352	my $req = List::Util::sum @req;	1847	my $req = List::Util::sum @req;
1353		1848
1354	if ($req > $space) {	1849	if ($req > $space) {
1355	# ah well, not enough space	1850	# ah well, not enough space
1356	$_ *= $space / $req for @req;	1851	$_ *= $space / $req for @req;
1357	} else {	1852	} else {
1358	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1853	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359		1854
1360	$space = ($space - $req) / $expand; # remaining space to give away	1855	$space = ($space - $req) / $expand; # remaining space to give away
1361		1856
1362	$req[$_] += $space * $children->[$_]{expand}	1857	$req[$_] += $space * $children[$_]{expand}
1363	for 0 .. $#$children;	1858	for 0 .. $#children;
1364	}	1859	}
1365	}	1860	}
1366		1861
1367	CFClient::UI::harmonize \@req;	1862	CFPlus::UI::harmonize \@req;
1368		1863
1369	my $pos = 0;	1864	my $pos = 0;
1370	for (0 .. $#$children) {	1865	for (0 .. $#children) {
1371	my $alloc = $req[$_];	1866	my $alloc = $req[$_];
1372	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1867	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373		1868
1374	$pos += $alloc;	1869	$pos += $alloc;
1375	}	1870	}
1376		1871
1377	1	1872	1
1378	}	1873	}
1379		1874
1380	#############################################################################	1875	#############################################################################
1381		1876
1382	package CFClient::UI::HBox;	1877	package CFPlus::UI::HBox;
1383		1878
1384	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1385		1880
1386	sub new {	1881	sub new {
1387	my $class = shift;	1882	my $class = shift;
1388		1883
1389	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1392	)	1887	)
1393	}	1888	}
1394		1889
1395	#############################################################################	1890	#############################################################################
1396		1891
1397	package CFClient::UI::VBox;	1892	package CFPlus::UI::VBox;
1398		1893
1399	our @ISA = CFClient::UI::Box::;	1894	our @ISA = CFPlus::UI::Box::;
1400		1895
1401	sub new {	1896	sub new {
1402	my $class = shift;	1897	my $class = shift;
1403		1898
1404	$class->SUPER::new (	1899	$class->SUPER::new (
…		…
1407	)	1902	)
1408	}	1903	}
1409		1904
1410	#############################################################################	1905	#############################################################################
1411		1906
1412	package CFClient::UI::Label;	1907	package CFPlus::UI::Label;
1413		1908
1414	our @ISA = CFClient::UI::DrawBG::;	1909	our @ISA = CFPlus::UI::DrawBG::;
1415		1910
1416	use CFClient::OpenGL;	1911	use CFPlus::OpenGL;
1417		1912
1418	sub new {	1913	sub new {
1419	my ($class, %arg) = @_;	1914	my ($class, %arg) = @_;
1420		1915
1421	my $self = $class->SUPER::new (	1916	my $self = $class->SUPER::new (
…		…
1424	#active_bg => none	1919	#active_bg => none
1425	#font => default_font	1920	#font => default_font
1426	#text => initial text	1921	#text => initial text
1427	#markup => initial narkup	1922	#markup => initial narkup
1428	#max_w => maximum pixel width	1923	#max_w => maximum pixel width
		1924	#style => 0, # render flags
1429	ellipsise => 3, # end	1925	ellipsise => 3, # end
1430	layout => (new CFClient::Layout),	1926	layout => (new CFPlus::Layout),
1431	fontsize => 1,	1927	fontsize => 1,
1432	align => -1,	1928	align => -1,
1433	valign => -1,	1929	valign => -1,
1434	padding_x => 2,	1930	padding_x => 2,
1435	padding_y => 2,	1931	padding_y => 2,
1436	can_events => 0,	1932	can_events => 0,
1437	%arg	1933	%arg
1438	);	1934	);
1439		1935
1440	if (exists $self->{template}) {	1936	if (exists $self->{template}) {
1441	my $layout = new CFClient::Layout;	1937	my $layout = new CFPlus::Layout;
1442	$layout->set_text (delete $self->{template});	1938	$layout->set_text (delete $self->{template});
1443	$self->{template} = $layout;	1939	$self->{template} = $layout;
1444	}	1940	}
1445		1941
1446	if (exists $self->{markup}) {	1942	if (exists $self->{markup}) {
…		…
1450	}	1946	}
1451		1947
1452	$self	1948	$self
1453	}	1949	}
1454		1950
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 {	1951	sub update {
1466	my ($self) = @_;	1952	my ($self) = @_;
1467		1953
1468	delete $self->{texture};	1954	delete $self->{texture};
1469	$self->SUPER::update;	1955	$self->SUPER::update;
1470	}	1956	}
1471		1957
		1958	sub realloc {
		1959	my ($self) = @_;
		1960
		1961	delete $self->{ox};
		1962	$self->SUPER::realloc;
		1963	}
		1964
1472	sub set_text {	1965	sub set_text {
1473	my ($self, $text) = @_;	1966	my ($self, $text) = @_;
1474		1967
1475	return if $self->{text} eq "T$text";	1968	return if $self->{text} eq "T$text";
1476	$self->{text} = "T$text";	1969	$self->{text} = "T$text";
1477		1970
1478	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479	$self->{layout}->set_text ($text);	1971	$self->{layout}->set_text ($text);
1480		1972
		1973	delete $self->{size_req};
1481	$self->realloc;	1974	$self->realloc;
1482	$self->update;	1975	$self->update;
1483	}	1976	}
1484		1977
1485	sub set_markup {	1978	sub set_markup {
…		…
1488	return if $self->{text} eq "M$markup";	1981	return if $self->{text} eq "M$markup";
1489	$self->{text} = "M$markup";	1982	$self->{text} = "M$markup";
1490		1983
1491	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1984	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492		1985
1493	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494	$self->{layout}->set_markup ($markup);	1986	$self->{layout}->set_markup ($markup);
1495		1987
		1988	delete $self->{size_req};
1496	$self->realloc;	1989	$self->realloc;
1497	$self->update;	1990	$self->update;
1498	}	1991	}
1499		1992
1500	sub size_request {	1993	sub size_request {
1501	my ($self) = @_;	1994	my ($self) = @_;
1502		1995
		1996	$self->{size_req} ||= do {
1503	$self->{layout}->set_font ($self->{font}) if $self->{font};	1997	$self->{layout}->set_font ($self->{font}) if $self->{font};
1504	$self->{layout}->set_width ($self->{max_w} || -1);	1998	$self->{layout}->set_width ($self->{max_w} || -1);
1505	$self->{layout}->set_ellipsise ($self->{ellipsise});	1999	$self->{layout}->set_ellipsise ($self->{ellipsise});
1506	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2000	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2001	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508		2002
1509	my ($w, $h) = $self->{layout}->size;	2003	my ($w, $h) = $self->{layout}->size;
1510		2004
1511	if (exists $self->{template}) {	2005	if (exists $self->{template}) {
1512	$self->{template}->set_font ($self->{font}) if $self->{font};	2006	$self->{template}->set_font ($self->{font}) if $self->{font};
		2007	$self->{template}->set_width ($self->{max_w} || -1);
1513	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2008	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514		2009
1515	my ($w2, $h2) = $self->{template}->size;	2010	my ($w2, $h2) = $self->{template}->size;
1516		2011
1517	$w = List::Util::max $w, $w2;	2012	$w = List::Util::max $w, $w2;
1518	$h = List::Util::max $h, $h2;	2013	$h = List::Util::max $h, $h2;
		2014	}
		2015
		2016	[$w, $h]
1519	}	2017	};
1520		2018
1521	($w, $h)	2019	@{ $self->{size_req} }
1522	}	2020	}
1523		2021
		2022	sub baseline_shift {
		2023	$_[0]{layout}->descent
		2024	}
		2025
1524	sub size_allocate {	2026	sub invoke_size_allocate {
1525	my ($self, $w, $h) = @_;	2027	my ($self, $w, $h) = @_;
1526		2028
		2029	delete $self->{ox};
		2030
1527	delete $self->{texture};	2031	delete $self->{texture}
		2032	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2033
		2034	1
1528	}	2035	}
1529		2036
1530	sub set_fontsize {	2037	sub set_fontsize {
1531	my ($self, $fontsize) = @_;	2038	my ($self, $fontsize) = @_;
1532		2039
1533	$self->{fontsize} = $fontsize;	2040	$self->{fontsize} = $fontsize;
		2041	delete $self->{size_req};
1534	delete $self->{texture};	2042	delete $self->{texture};
1535		2043
1536	$self->realloc;	2044	$self->realloc;
1537	}	2045	}
1538		2046
		2047	sub reconfigure {
		2048	my ($self) = @_;
		2049
		2050	delete $self->{size_req};
		2051	delete $self->{texture};
		2052
		2053	$self->SUPER::reconfigure;
		2054	}
		2055
1539	sub _draw {	2056	sub _draw {
1540	my ($self) = @_;	2057	my ($self) = @_;
1541		2058
1542	$self->SUPER::_draw; # draw background, if applicable	2059	$self->SUPER::_draw; # draw background, if applicable
1543		2060
1544	my $tex = $self->{texture} ||= do {	2061	my $size = $self->{texture} ||= do {
1545	$self->{layout}->set_foreground (@{$self->{fg}});	2062	$self->{layout}->set_foreground (@{$self->{fg}});
1546	$self->{layout}->set_font ($self->{font}) if $self->{font};	2063	$self->{layout}->set_font ($self->{font}) if $self->{font};
1547	$self->{layout}->set_width ($self->{w});	2064	$self->{layout}->set_width ($self->{w});
1548	$self->{layout}->set_ellipsise ($self->{ellipsise});	2065	$self->{layout}->set_ellipsise ($self->{ellipsise});
1549	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2066	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2067	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551		2068
1552	my $tex = new_from_layout CFClient::Texture $self->{layout};	2069	[$self->{layout}->size]
		2070	};
1553		2071
		2072	unless (exists $self->{ox}) {
1554	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2073	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2074	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556	: ($self->{w} - $tex->{w}) * 0.5);	2075	: ($self->{w} - $size->[0]) * 0.5);
1557		2076
1558	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2077	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2078	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560	: ($self->{h} - $tex->{h}) * 0.5);	2079	: ($self->{h} - $size->[1]) * 0.5);
1561
1562	$tex
1563	};	2080	};
1564		2081
1565	glEnable GL_TEXTURE_2D;	2082	my $w = List::Util::min $self->{w} + 4, $size->[0];
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2083	my $h = List::Util::min $self->{h} + 2, $size->[1];
1567		2084
1568	if ($tex->{format} == GL_ALPHA) {	2085	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1569	glColor @{$self->{fg}};
1570	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571	} else {
1572	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573	}
1574
1575	glDisable GL_TEXTURE_2D;
1576	}	2086	}
1577		2087
1578	#############################################################################	2088	#############################################################################
1579		2089
1580	package CFClient::UI::EntryBase;	2090	package CFPlus::UI::EntryBase;
1581		2091
1582	our @ISA = CFClient::UI::Label::;	2092	our @ISA = CFPlus::UI::Label::;
1583		2093
1584	use CFClient::OpenGL;	2094	use CFPlus::OpenGL;
1585		2095
1586	sub new {	2096	sub new {
1587	my $class = shift;	2097	my $class = shift;
1588		2098
1589	$class->SUPER::new (	2099	$class->SUPER::new (
…		…
1593	active_fg => [0, 0, 0],	2103	active_fg => [0, 0, 0],
1594	can_hover => 1,	2104	can_hover => 1,
1595	can_focus => 1,	2105	can_focus => 1,
1596	valign => 0,	2106	valign => 0,
1597	can_events => 1,	2107	can_events => 1,
		2108	ellipsise => 0,
1598	#text => ...	2109	#text => ...
		2110	#hidden => "*",
1599	@_	2111	@_
1600	)	2112	)
1601	}	2113	}
1602		2114
1603	sub _set_text {	2115	sub _set_text {
…		…
1605		2117
1606	delete $self->{cur_h};	2118	delete $self->{cur_h};
1607		2119
1608	return if $self->{text} eq $text;	2120	return if $self->{text} eq $text;
1609		2121
1610	delete $self->{texture};
1611
1612	$self->{last_activity} = $::NOW;	2122	$self->{last_activity} = $::NOW;
1613	$self->{text} = $text;	2123	$self->{text} = $text;
1614		2124
1615	$text =~ s/./*/g if $self->{hidden};	2125	$text =~ s/./*/g if $self->{hidden};
1616	$self->{layout}->set_text ("$text ");	2126	$self->{layout}->set_text ("$text ");
		2127	delete $self->{size_req};
1617		2128
1618	$self->_emit (changed => $self->{text});	2129	$self->emit (changed => $self->{text});
		2130
		2131	$self->realloc;
		2132	$self->update;
1619	}	2133	}
1620		2134
1621	sub set_text {	2135	sub set_text {
1622	my ($self, $text) = @_;	2136	my ($self, $text) = @_;
1623		2137
1624	$self->{cursor} = length $text;	2138	$self->{cursor} = length $text;
1625	$self->_set_text ($text);	2139	$self->_set_text ($text);
1626
1627	$self->realloc;
1628	}	2140	}
1629		2141
1630	sub get_text {	2142	sub get_text {
1631	$_[0]{text}	2143	$_[0]{text}
1632	}	2144	}
…		…
1637	my ($w, $h) = $self->SUPER::size_request;	2149	my ($w, $h) = $self->SUPER::size_request;
1638		2150
1639	($w + 1, $h) # add 1 for cursor	2151	($w + 1, $h) # add 1 for cursor
1640	}	2152	}
1641		2153
1642	sub key_down {	2154	sub invoke_key_down {
1643	my ($self, $ev) = @_;	2155	my ($self, $ev) = @_;
1644		2156
1645	my $mod = $ev->{mod};	2157	my $mod = $ev->{mod};
1646	my $sym = $ev->{sym};	2158	my $sym = $ev->{sym};
1647	my $uni = $ev->{unicode};	2159	my $uni = $ev->{unicode};
1648		2160
1649	my $text = $self->get_text;	2161	my $text = $self->get_text;
		2162
		2163	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1650		2164
1651	if ($uni == 8) {	2165	if ($uni == 8) {
1652	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2166	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1653	} elsif ($uni == 127) {	2167	} elsif ($uni == 127) {
1654	substr $text, $self->{cursor}, 1, "";	2168	substr $text, $self->{cursor}, 1, "";
1655	} elsif ($sym == CFClient::SDLK_LEFT) {	2169	} elsif ($sym == CFPlus::SDLK_LEFT) {
1656	--$self->{cursor} if $self->{cursor};	2170	--$self->{cursor} if $self->{cursor};
1657	} elsif ($sym == CFClient::SDLK_RIGHT) {	2171	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1658	++$self->{cursor} if $self->{cursor} < length $self->{text};	2172	++$self->{cursor} if $self->{cursor} < length $self->{text};
1659	} elsif ($sym == CFClient::SDLK_HOME) {	2173	} elsif ($sym == CFPlus::SDLK_HOME) {
		2174	# what a hack
		2175	$self->{cursor} =
		2176	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2177	? length $1
		2178	: 0;
		2179	} elsif ($sym == CFPlus::SDLK_END) {
		2180	# uh, again
		2181	$self->{cursor} =
		2182	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2183	? $self->{cursor} + length $1
		2184	: length $self->{text};
		2185	} elsif ($uni == 21) { # ctrl-u
		2186	$text = "";
1660	$self->{cursor} = 0;	2187	$self->{cursor} = 0;
1661	} elsif ($sym == CFClient::SDLK_END) {
1662	$self->{cursor} = length $text;
1663	} elsif ($uni == 27) {	2188	} elsif ($uni == 27) {
1664	$self->_emit ('escape');	2189	$self->emit ('escape');
1665	} elsif ($uni) {	2190	} elsif ($uni == 0x0d) {
		2191	substr $text, $self->{cursor}++, 0, "\012";
		2192	} elsif ($uni >= 0x20) {
1666	substr $text, $self->{cursor}++, 0, chr $uni;	2193	substr $text, $self->{cursor}++, 0, chr $uni;
		2194	} else {
		2195	return 0;
1667	}	2196	}
1668		2197
1669	$self->_set_text ($text);	2198	$self->_set_text ($text);
1670		2199
1671	$self->realloc;	2200	$self->realloc;
1672	}	2201	$self->update;
1673		2202
		2203	1
		2204	}
		2205
1674	sub focus_in {	2206	sub invoke_focus_in {
1675	my ($self) = @_;	2207	my ($self) = @_;
1676		2208
1677	$self->{last_activity} = $::NOW;	2209	$self->{last_activity} = $::NOW;
1678		2210
1679	$self->SUPER::focus_in;	2211	$self->SUPER::invoke_focus_in
1680	}	2212	}
1681		2213
1682	sub button_down {	2214	sub invoke_button_down {
1683	my ($self, $ev, $x, $y) = @_;	2215	my ($self, $ev, $x, $y) = @_;
1684		2216
1685	$self->SUPER::button_down ($ev, $x, $y);	2217	$self->SUPER::invoke_button_down ($ev, $x, $y);
1686		2218
1687	my $idx = $self->{layout}->xy_to_index ($x, $y);	2219	my $idx = $self->{layout}->xy_to_index ($x, $y);
1688		2220
1689	# byte-index to char-index	2221	# byte-index to char-index
1690	my $text = $self->{text};	2222	my $text = $self->{text};
1691	utf8::encode $text;	2223	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692	$self->{cursor} = length substr $text, 0, $idx;	2224	$self->{cursor} = length $text;
1693		2225
1694	$self->_set_text ($self->{text});	2226	$self->_set_text ($self->{text});
1695	$self->update;	2227	$self->update;
		2228
		2229	1
1696	}	2230	}
1697		2231
1698	sub mouse_motion {	2232	sub invoke_mouse_motion {
1699	my ($self, $ev, $x, $y) = @_;	2233	my ($self, $ev, $x, $y) = @_;
1700	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2234	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2235
		2236	1
1701	}	2237	}
1702		2238
1703	sub _draw {	2239	sub _draw {
1704	my ($self) = @_;	2240	my ($self) = @_;
1705		2241
1706	local $self->{fg} = $self->{fg};	2242	local $self->{fg} = $self->{fg};
1707		2243
1708	if ($FOCUS == $self) {	2244	if ($FOCUS == $self) {
1709	glColor @{$self->{active_bg}};	2245	glColor_premultiply @{$self->{active_bg}};
1710	$self->{fg} = $self->{active_fg};	2246	$self->{fg} = $self->{active_fg};
1711	} else {	2247	} else {
1712	glColor @{$self->{bg}};	2248	glColor_premultiply @{$self->{bg}};
1713	}	2249	}
1714		2250
1715	glEnable GL_BLEND;	2251	glEnable GL_BLEND;
1716	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2252	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717	glBegin GL_QUADS;	2253	glBegin GL_QUADS;
1718	glVertex 0 , 0;	2254	glVertex 0 , 0;
1719	glVertex 0 , $self->{h};	2255	glVertex 0 , $self->{h};
1720	glVertex $self->{w}, $self->{h};	2256	glVertex $self->{w}, $self->{h};
1721	glVertex $self->{w}, 0;	2257	glVertex $self->{w}, 0;
…		…
1732	utf8::encode $text;	2268	utf8::encode $text;
1733		2269
1734	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2270	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1735	}	2271	}
1736		2272
1737	glColor @{$self->{fg}};
1738	glBegin GL_LINES;	2273	glBegin GL_LINES;
1739	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2274	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1740	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2275	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1741	glEnd;	2276	glEnd;
1742	}	2277	}
1743	}	2278	}
1744		2279
		2280	#############################################################################
		2281
1745	package CFClient::UI::Entry;	2282	package CFPlus::UI::Entry;
1746		2283
1747	our @ISA = CFClient::UI::EntryBase::;	2284	our @ISA = CFPlus::UI::EntryBase::;
1748		2285
1749	use CFClient::OpenGL;	2286	use CFPlus::OpenGL;
1750		2287
1751	sub key_down {	2288	sub invoke_key_down {
1752	my ($self, $ev) = @_;	2289	my ($self, $ev) = @_;
1753		2290
1754	my $sym = $ev->{sym};	2291	my $sym = $ev->{sym};
1755		2292
1756	if ($sym == 13) {	2293	if ($ev->{uni} == 0x0d || $sym == 13) {
1757	unshift @{$self->{history}},	2294	unshift @{$self->{history}},
1758	my $txt = $self->get_text;	2295	my $txt = $self->get_text;
		2296
1759	$self->{history_pointer} = -1;	2297	$self->{history_pointer} = -1;
1760	$self->{history_saveback} = '';	2298	$self->{history_saveback} = '';
1761	$self->_emit (activate => $txt);	2299	$self->emit (activate => $txt);
1762	$self->update;	2300	$self->update;
1763		2301
1764	} elsif ($sym == CFClient::SDLK_UP) {	2302	} elsif ($sym == CFPlus::SDLK_UP) {
1765	if ($self->{history_pointer} < 0) {	2303	if ($self->{history_pointer} < 0) {
1766	$self->{history_saveback} = $self->get_text;	2304	$self->{history_saveback} = $self->get_text;
1767	}	2305	}
1768	if (@{$self->{history} || []} > 0) {	2306	if (@{$self->{history} || []} > 0) {
1769	$self->{history_pointer}++;	2307	$self->{history_pointer}++;
…		…
1771	$self->{history_pointer} = @{$self->{history} || []} - 1;	2309	$self->{history_pointer} = @{$self->{history} || []} - 1;
1772	}	2310	}
1773	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1774	}	2312	}
1775		2313
1776	} elsif ($sym == CFClient::SDLK_DOWN) {	2314	} elsif ($sym == CFPlus::SDLK_DOWN) {
1777	$self->{history_pointer}--;	2315	$self->{history_pointer}--;
1778	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779		2317
1780	if ($self->{history_pointer} >= 0) {	2318	if ($self->{history_pointer} >= 0) {
1781	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1782	} else {	2320	} else {
1783	$self->set_text ($self->{history_saveback});	2321	$self->set_text ($self->{history_saveback});
1784	}	2322	}
1785		2323
1786	} else {	2324	} else {
1787	$self->SUPER::key_down ($ev);	2325	return $self->SUPER::invoke_key_down ($ev)
		2326	}
		2327
1788	}	2328	1
1789
1790	}	2329	}
1791		2330
1792	#############################################################################	2331	#############################################################################
1793		2332
		2333	package CFPlus::UI::TextEdit;
		2334
		2335	our @ISA = CFPlus::UI::EntryBase::;
		2336
		2337	use CFPlus::OpenGL;
		2338
		2339	sub move_cursor_ver {
		2340	my ($self, $dy) = @_;
		2341
		2342	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2343
		2344	$y += $dy;
		2345
		2346	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2347	$self->{cursor} = $index;
		2348	delete $self->{cur_h};
		2349	$self->update;
		2350	return;
		2351	}
		2352	}
		2353
		2354	sub invoke_key_down {
		2355	my ($self, $ev) = @_;
		2356
		2357	my $sym = $ev->{sym};
		2358
		2359	if ($sym == CFPlus::SDLK_UP) {
		2360	$self->move_cursor_ver (-1);
		2361	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2362	$self->move_cursor_ver (+1);
		2363	} else {
		2364	return $self->SUPER::invoke_key_down ($ev)
		2365	}
		2366
		2367	1
		2368	}
		2369
		2370	#############################################################################
		2371
1794	package CFClient::UI::Button;	2372	package CFPlus::UI::Button;
1795		2373
1796	our @ISA = CFClient::UI::Label::;	2374	our @ISA = CFPlus::UI::Label::;
1797		2375
1798	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
1799		2377
1800	my @tex =	2378	my @tex =
1801	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1802	qw(b1_button_active.png);	2380	qw(b1_button_active.png);
1803		2381
1804	sub new {	2382	sub new {
1805	my $class = shift;	2383	my $class = shift;
1806		2384
…		…
1815	can_events => 1,	2393	can_events => 1,
1816	@_	2394	@_
1817	)	2395	)
1818	}	2396	}
1819		2397
1820	sub activate { }
1821
1822	sub button_up {	2398	sub invoke_button_up {
1823	my ($self, $ev, $x, $y) = @_;	2399	my ($self, $ev, $x, $y) = @_;
1824		2400
1825	$self->emit ("activate")	2401	$self->emit ("activate")
1826	if $x >= 0 && $x < $self->{w}	2402	if $x >= 0 && $x < $self->{w}
1827	&& $y >= 0 && $y < $self->{h};	2403	&& $y >= 0 && $y < $self->{h};
		2404
		2405	1
1828	}	2406	}
1829		2407
1830	sub _draw {	2408	sub _draw {
1831	my ($self) = @_;	2409	my ($self) = @_;
1832		2410
1833	local $self->{fg} = $self->{fg};	2411	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835	if ($GRAB == $self) {
1836	$self->{fg} = $self->{active_fg};
1837	}
1838		2412
1839	glEnable GL_TEXTURE_2D;	2413	glEnable GL_TEXTURE_2D;
1840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2414	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841	glColor 0, 0, 0, 1;	2415	glColor 0, 0, 0, 1;
1842		2416
…		…
1847	$self->SUPER::_draw;	2421	$self->SUPER::_draw;
1848	}	2422	}
1849		2423
1850	#############################################################################	2424	#############################################################################
1851		2425
1852	package CFClient::UI::CheckBox;	2426	package CFPlus::UI::CheckBox;
1853		2427
1854	our @ISA = CFClient::UI::DrawBG::;	2428	our @ISA = CFPlus::UI::DrawBG::;
1855		2429
1856	my @tex =	2430	my @tex =
1857	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2432	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859		2433
1860	use CFClient::OpenGL;	2434	use CFPlus::OpenGL;
1861		2435
1862	sub new {	2436	sub new {
1863	my $class = shift;	2437	my $class = shift;
1864		2438
1865	$class->SUPER::new (	2439	$class->SUPER::new (
…		…
1879	my ($self) = @_;	2453	my ($self) = @_;
1880		2454
1881	(6) x 2	2455	(6) x 2
1882	}	2456	}
1883		2457
		2458	sub toggle {
		2459	my ($self) = @_;
		2460
		2461	$self->{state} = !$self->{state};
		2462	$self->emit (changed => $self->{state});
		2463	$self->update;
		2464	}
		2465
1884	sub button_down {	2466	sub invoke_button_down {
1885	my ($self, $ev, $x, $y) = @_;	2467	my ($self, $ev, $x, $y) = @_;
1886		2468
1887	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2469	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2470	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889	$self->{state} = !$self->{state};	2471	$self->toggle;
1890	$self->_emit (changed => $self->{state});	2472	} else {
		2473	return 0
		2474	}
		2475
1891	}	2476	1
1892	}	2477	}
1893		2478
1894	sub _draw {	2479	sub _draw {
1895	my ($self) = @_;	2480	my ($self) = @_;
1896		2481
…		…
1911	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
1912	}	2497	}
1913		2498
1914	#############################################################################	2499	#############################################################################
1915		2500
1916	package CFClient::UI::Image;	2501	package CFPlus::UI::Image;
1917		2502
1918	our @ISA = CFClient::UI::Base::;	2503	our @ISA = CFPlus::UI::Base::;
1919		2504
1920	use CFClient::OpenGL;	2505	use CFPlus::OpenGL;
1921	use Carp qw/confess/;
1922		2506
1923	our %loaded_images;	2507	our %texture_cache;
1924		2508
1925	sub new {	2509	sub new {
1926	my $class = shift;	2510	my $class = shift;
1927		2511
1928	my $self = $class->SUPER::new (can_events => 0, @_);	2512	my $self = $class->SUPER::new (
		2513	can_events => 0,
		2514	@_,
		2515	);
1929		2516
1930	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2517	$self->{path} || $self->{tex}
		2518	or Carp::croak "'path' or 'tex' attributes required";
1931		2519
1932	$loaded_images{$self->{image}} ||=	2520	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1933	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2521	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1934		2522
1935	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2523	CFPlus::weaken $texture_cache{$self->{path}};
1936		2524
1937	Scalar::Util::weaken $loaded_images{$self->{image}};	2525	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939	$self->{aspect} = $tex->{w} / $tex->{h};
1940		2526
1941	$self	2527	$self
1942	}	2528	}
1943		2529
		2530	sub STORABLE_freeze {
		2531	my ($self, $cloning) = @_;
		2532
		2533	$self->{path}
		2534	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2535
		2536	$self->{path}
		2537	}
		2538
		2539	sub STORABLE_attach {
		2540	my ($self, $cloning, $path) = @_;
		2541
		2542	$self->new (path => $path)
		2543	}
		2544
1944	sub size_request {	2545	sub size_request {
1945	my ($self) = @_;	2546	my ($self) = @_;
1946		2547
1947	($self->{tex}->{w}, $self->{tex}->{h})	2548	($self->{tex}{w}, $self->{tex}{h})
1948	}	2549	}
1949		2550
1950	sub _draw {	2551	sub _draw {
1951	my ($self) = @_;	2552	my ($self) = @_;
1952		2553
…		…
1962	}	2563	}
1963		2564
1964	glEnable GL_TEXTURE_2D;	2565	glEnable GL_TEXTURE_2D;
1965	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966		2567
1967	$tex->draw_quad_alpha (0, 0, $w, $h);	2568	$tex->draw_quad (0, 0, $w, $h);
1968		2569
1969	glDisable GL_TEXTURE_2D;	2570	glDisable GL_TEXTURE_2D;
1970	}	2571	}
1971		2572
1972	#############################################################################	2573	#############################################################################
1973		2574
		2575	package CFPlus::UI::ImageButton;
		2576
		2577	our @ISA = CFPlus::UI::Image::;
		2578
		2579	use CFPlus::OpenGL;
		2580
		2581	my %textures;
		2582
		2583	sub new {
		2584	my $class = shift;
		2585
		2586	my $self = $class->SUPER::new (
		2587	padding_x => 4,
		2588	padding_y => 4,
		2589	fg => [1, 1, 1],
		2590	active_fg => [0, 0, 1],
		2591	can_hover => 1,
		2592	align => 0,
		2593	valign => 0,
		2594	can_events => 1,
		2595	@_
		2596	);
		2597	}
		2598
		2599	sub invoke_button_up {
		2600	my ($self, $ev, $x, $y) = @_;
		2601
		2602	$self->emit ("activate")
		2603	if $x >= 0 && $x < $self->{w}
		2604	&& $y >= 0 && $y < $self->{h};
		2605
		2606	1
		2607	}
		2608
		2609	#############################################################################
		2610
1974	package CFClient::UI::VGauge;	2611	package CFPlus::UI::VGauge;
1975		2612
1976	our @ISA = CFClient::UI::Base::;	2613	our @ISA = CFPlus::UI::Base::;
1977		2614
1978	use List::Util qw(min max);	2615	use List::Util qw(min max);
1979		2616
1980	use CFClient::OpenGL;	2617	use CFPlus::OpenGL;
1981		2618
1982	my %tex = (	2619	my %tex = (
1983	food => [	2620	food => [
1984	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1985	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2622	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986	],	2623	],
1987	grace => [	2624	grace => [
1988	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2625	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1989	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2626	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990	],	2627	],
1991	hp => [	2628	hp => [
1992	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2629	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1993	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2630	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994	],	2631	],
1995	mana => [	2632	mana => [
1996	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2633	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1997	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2634	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998	],	2635	],
1999	);	2636	);
2000		2637
2001	# eg. VGauge->new (gauge => 'food'), default gauge: food	2638	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2061	my $ycut1 = max 0, min 1, $ycut;	2698	my $ycut1 = max 0, min 1, $ycut;
2062	my $ycut2 = max 0, min 1, $ycut - 1;	2699	my $ycut2 = max 0, min 1, $ycut - 1;
2063		2700
2064	my $h1 = $self->{h} * (1 - $ycut1);	2701	my $h1 = $self->{h} * (1 - $ycut1);
2065	my $h2 = $self->{h} * (1 - $ycut2);	2702	my $h2 = $self->{h} * (1 - $ycut2);
		2703	my $h3 = $self->{h};
		2704
		2705	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066		2706
2067	glEnable GL_BLEND;	2707	glEnable GL_BLEND;
2068	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2708	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2709	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069	glEnable GL_TEXTURE_2D;	2710	glEnable GL_TEXTURE_2D;
2070	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2711	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071		2712
2072	glBindTexture GL_TEXTURE_2D, $t1->{name};	2713	glBindTexture GL_TEXTURE_2D, $t1->{name};
2073	glBegin GL_QUADS;	2714	glBegin GL_QUADS;
…		…
2088		2729
2089	if ($t3) {	2730	if ($t3) {
2090	glBindTexture GL_TEXTURE_2D, $t3->{name};	2731	glBindTexture GL_TEXTURE_2D, $t3->{name};
2091	glBegin GL_QUADS;	2732	glBegin GL_QUADS;
2092	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2733	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2734	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2735	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2736	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096	glEnd;	2737	glEnd;
2097	}	2738	}
2098		2739
2099	glDisable GL_BLEND;	2740	glDisable GL_BLEND;
2100	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2101	}	2742	}
2102		2743
2103	#############################################################################	2744	#############################################################################
2104		2745
2105	package CFClient::UI::Gauge;	2746	package CFPlus::UI::Gauge;
2106		2747
2107	our @ISA = CFClient::UI::VBox::;	2748	our @ISA = CFPlus::UI::VBox::;
2108		2749
2109	sub new {	2750	sub new {
2110	my ($class, %arg) = @_;	2751	my ($class, %arg) = @_;
2111		2752
2112	my $self = $class->SUPER::new (	2753	my $self = $class->SUPER::new (
…		…
2114	can_hover => 1,	2755	can_hover => 1,
2115	can_events => 1,	2756	can_events => 1,
2116	%arg,	2757	%arg,
2117	);	2758	);
2118		2759
2119	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2760	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2120	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2761	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2121	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2762	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2122		2763
2123	$self	2764	$self
2124	}	2765	}
2125		2766
2126	sub set_fontsize {	2767	sub set_fontsize {
…		…
2147	$self->{value}->set_text ($val);	2788	$self->{value}->set_text ($val);
2148	}	2789	}
2149		2790
2150	#############################################################################	2791	#############################################################################
2151		2792
2152	package CFClient::UI::Slider;	2793	package CFPlus::UI::Slider;
2153		2794
2154	use strict;	2795	use strict;
2155		2796
2156	use CFClient::OpenGL;	2797	use CFPlus::OpenGL;
2157		2798
2158	our @ISA = CFClient::UI::DrawBG::;	2799	our @ISA = CFPlus::UI::DrawBG::;
2159		2800
2160	my @tex =	2801	my @tex =
2161	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2802	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2162	qw(s1_slider.png s1_slider_bg.png);	2803	qw(s1_slider.png s1_slider_bg.png);
2163		2804
2164	sub new {	2805	sub new {
2165	my $class = shift;	2806	my $class = shift;
2166		2807
…		…
2187	$self->update;	2828	$self->update;
2188		2829
2189	$self	2830	$self
2190	}	2831	}
2191		2832
2192	sub changed { }
2193
2194	sub set_range {	2833	sub set_range {
2195	my ($self, $range) = @_;	2834	my ($self, $range) = @_;
2196		2835
2197	($range, $self->{range}) = ($self->{range}, $range);	2836	($range, $self->{range}) = ($self->{range}, $range);
2198		2837
2199	$self->update
2200	if "@$range" ne "@{$self->{range}}";	2838	if ("@$range" ne "@{$self->{range}}") {
		2839	$self->update;
		2840	$self->set_value ($self->{range}[0]);
		2841	}
2201	}	2842	}
2202		2843
2203	sub set_value {	2844	sub set_value {
2204	my ($self, $value) = @_;	2845	my ($self, $value) = @_;
2205		2846
…		…
2216	if $unit;	2857	if $unit;
2217		2858
2218	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2859	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219		2860
2220	if ($value != $old_value) {	2861	if ($value != $old_value) {
2221	$self->_emit (changed => $value);	2862	$self->emit (changed => $value);
2222	$self->update;	2863	$self->update;
2223	}	2864	}
2224	}	2865	}
2225		2866
2226	sub size_request {	2867	sub size_request {
2227	my ($self) = @_;	2868	my ($self) = @_;
2228		2869
2229	($self->{req_w}, $self->{req_h})	2870	($self->{req_w}, $self->{req_h})
2230	}	2871	}
2231		2872
2232	sub button_down {	2873	sub invoke_button_down {
2233	my ($self, $ev, $x, $y) = @_;	2874	my ($self, $ev, $x, $y) = @_;
2234		2875
2235	$self->SUPER::button_down ($ev, $x, $y);	2876	$self->SUPER::invoke_button_down ($ev, $x, $y);
2236		2877
2237	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2878	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238		2879
2239	$self->mouse_motion ($ev, $x, $y);	2880	$self->invoke_mouse_motion ($ev, $x, $y)
2240	}	2881	}
2241		2882
2242	sub mouse_motion {	2883	sub invoke_mouse_motion {
2243	my ($self, $ev, $x, $y) = @_;	2884	my ($self, $ev, $x, $y) = @_;
2244		2885
2245	if ($GRAB == $self) {	2886	if ($GRAB == $self) {
2246	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2887	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247		2888
2248	my (undef, $lo, $hi, $page) = @{$self->{range}};	2889	my (undef, $lo, $hi, $page) = @{$self->{range}};
2249		2890
2250	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2891	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251		2892
2252	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2893	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2894	} else {
		2895	return 0;
		2896	}
		2897
2253	}	2898	1
		2899	}
		2900
		2901	sub invoke_mouse_wheel {
		2902	my ($self, $ev) = @_;
		2903
		2904	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2905
		2906	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2907
		2908	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2909
		2910	! ! $delta
2254	}	2911	}
2255		2912
2256	sub update {	2913	sub update {
2257	my ($self) = @_;	2914	my ($self) = @_;
2258		2915
2259	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2916	delete $self->{knob_w};
		2917	$self->SUPER::update;
		2918	}
		2919
		2920	sub _draw {
		2921	my ($self) = @_;
		2922
		2923	unless ($self->{knob_w}) {
2260	$self->set_value ($self->{range}[0]);	2924	$self->set_value ($self->{range}[0]);
2261		2925
2262	my ($value, $lo, $hi, $page) = @{$self->{range}};	2926	my ($value, $lo, $hi, $page) = @{$self->{range}};
2263	my $range = ($hi - $page - $lo) || 1e-100;	2927	my $range = ($hi - $page - $lo) || 1e-100;
2264		2928
…		…
2270	$value = ($value - $lo) / $range;	2934	$value = ($value - $lo) / $range;
2271	$value = $value * $self->{scale} + $self->{offset};	2935	$value = $value * $self->{scale} + $self->{offset};
2272		2936
2273	$self->{knob_x} = $value - $knob_w * 0.5;	2937	$self->{knob_x} = $value - $knob_w * 0.5;
2274	$self->{knob_w} = $knob_w;	2938	$self->{knob_w} = $knob_w;
2275	});	2939	}
2276
2277	$self->SUPER::update;
2278	}
2279
2280	sub _draw {
2281	my ($self) = @_;
2282		2940
2283	$self->SUPER::_draw ();	2941	$self->SUPER::_draw ();
2284		2942
2285	glScale $self->{w}, $self->{h};	2943	glScale $self->{w}, $self->{h};
2286		2944
…		…
2306	glDisable GL_TEXTURE_2D;	2964	glDisable GL_TEXTURE_2D;
2307	}	2965	}
2308		2966
2309	#############################################################################	2967	#############################################################################
2310		2968
2311	package CFClient::UI::ValSlider;	2969	package CFPlus::UI::ValSlider;
2312		2970
2313	our @ISA = CFClient::UI::HBox::;	2971	our @ISA = CFPlus::UI::HBox::;
2314		2972
2315	sub new {	2973	sub new {
2316	my ($class, %arg) = @_;	2974	my ($class, %arg) = @_;
2317		2975
2318	my $range = delete $arg{range};	2976	my $range = delete $arg{range};
2319		2977
2320	my $self = $class->SUPER::new (	2978	my $self = $class->SUPER::new (
2321	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2979	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2322	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2980	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2323	to_value => sub { shift },	2981	to_value => sub { shift },
2324	from_value => sub { shift },	2982	from_value => sub { shift },
2325	%arg,	2983	%arg,
2326	);	2984	);
2327		2985
…		…
2347	sub set_range { shift->{slider}->set_range (@_) }	3005	sub set_range { shift->{slider}->set_range (@_) }
2348	sub set_value { shift->{slider}->set_value (@_) }	3006	sub set_value { shift->{slider}->set_value (@_) }
2349		3007
2350	#############################################################################	3008	#############################################################################
2351		3009
2352	package CFClient::UI::TextView;	3010	package CFPlus::UI::TextScroller;
2353		3011
2354	our @ISA = CFClient::UI::HBox::;	3012	our @ISA = CFPlus::UI::HBox::;
2355		3013
2356	use CFClient::OpenGL;	3014	use CFPlus::OpenGL;
2357		3015
2358	sub new {	3016	sub new {
2359	my $class = shift;	3017	my $class = shift;
2360		3018
2361	my $self = $class->SUPER::new (	3019	my $self = $class->SUPER::new (
2362	fontsize => 1,	3020	fontsize => 1,
2363	can_events => 0,	3021	can_events => 1,
		3022	indent => 0,
2364	#font => default_font	3023	#font => default_font
2365	@_,	3024	@_,
2366		3025
2367	layout => (new CFClient::Layout 1),	3026	layout => (new CFPlus::Layout),
2368	par => [],	3027	par => [],
		3028	max_par => 0,
2369	height => 0,	3029	height => 0,
2370	children => [	3030	children => [
2371	(new CFClient::UI::Empty expand => 1),	3031	(new CFPlus::UI::Empty expand => 1),
2372	(new CFClient::UI::Slider vertical => 1),	3032	(new CFPlus::UI::Slider vertical => 1),
2373	],	3033	],
2374	);	3034	);
2375		3035
2376	$self->{children}[1]->connect (changed => sub { $self->update });	3036	$self->{children}[1]->connect (changed => sub { $self->update });
2377		3037
…		…
2383		3043
2384	$self->{fontsize} = $fontsize;	3044	$self->{fontsize} = $fontsize;
2385	$self->reflow;	3045	$self->reflow;
2386	}	3046	}
2387		3047
		3048	sub size_request {
		3049	my ($self) = @_;
		3050
		3051	my ($empty, $slider) = @{ $self->{children} };
		3052
		3053	local $self->{children} = [$empty, $slider];
		3054	$self->SUPER::size_request
		3055	}
		3056
2388	sub size_allocate {	3057	sub invoke_size_allocate {
2389	my ($self, $w, $h) = @_;	3058	my ($self, $w, $h) = @_;
2390		3059
2391	$self->SUPER::size_allocate ($w, $h);	3060	my ($empty, $slider, @other) = @{ $self->{children} };
		3061	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392		3062
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	3063	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3064	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	3065	$self->{layout}->set_width ($empty->{w});
		3066	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396		3067
2397	$self->reflow;	3068	$self->reflow;
2398	}
2399		3069
2400	sub text_size {	3070	local $self->{children} = [$empty, $slider];
		3071	$self->SUPER::invoke_size_allocate ($w, $h)
		3072	}
		3073
		3074	sub invoke_mouse_wheel {
2401	my ($self, $text, $indent) = @_;	3075	my ($self, $ev) = @_;
		3076
		3077	return 0 unless $ev->{dy}; # only vertical movements
		3078
		3079	$self->{children}[1]->emit (mouse_wheel => $ev);
		3080
		3081	1
		3082	}
		3083
		3084	sub get_layout {
		3085	my ($self, $para) = @_;
2402		3086
2403	my $layout = $self->{layout};	3087	my $layout = $self->{layout};
2404		3088
		3089	$layout->set_font ($self->{font}) if $self->{font};
		3090	$layout->set_foreground (@{$para->{fg}});
2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3091	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406	$layout->set_width ($self->{children}[0]{w} - $indent);	3092	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3093	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407	$layout->set_markup ($text);	3094	$layout->set_markup ($para->{markup});
		3095
		3096	$layout->set_shapes (
		3097	map
		3098	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3099	@{$para->{widget}}
2408		3100	);
		3101
2409	$layout->size	3102	$layout
2410	}	3103	}
2411		3104
2412	sub reflow {	3105	sub reflow {
2413	my ($self) = @_;	3106	my ($self) = @_;
2414		3107
…		…
2421		3114
2422	# todo: base offset on lines or so, not on pixels	3115	# todo: base offset on lines or so, not on pixels
2423	$self->{children}[1]->set_value ($offset);	3116	$self->{children}[1]->set_value ($offset);
2424	}	3117	}
2425		3118
		3119	sub current_paragraph {
		3120	my ($self) = @_;
		3121
		3122	$self->{top_paragraph} - 1
		3123	}
		3124
		3125	sub scroll_to {
		3126	my ($self, $para) = @_;
		3127
		3128	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3129
		3130	$self->{scroll_to} = $para;
		3131	$self->update;
		3132	}
		3133
2426	sub clear {	3134	sub clear {
2427	my ($self) = @_;	3135	my ($self) = @_;
		3136
		3137	my (undef, undef, @other) = @{ $self->{children} };
		3138	$self->remove ($_) for @other;
2428		3139
2429	$self->{par} = [];	3140	$self->{par} = [];
2430	$self->{height} = 0;	3141	$self->{height} = 0;
2431	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3142	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432	}	3143	}
2433		3144
2434	sub add_paragraph {	3145	sub add_paragraph {
2435	my ($self, $color, $text, $indent) = @_;	3146	my $self = shift;
2436		3147
2437	for my $line (split /\n/, $text) {	3148	for my $para (@_) {
2438	my ($w, $h) = $self->text_size ($line);	3149	$para = {
		3150	fg => [1, 1, 1, 1],
		3151	indent => 0,
		3152	markup => "",
		3153	widget => [],
		3154	ref $para ? %$para : (markup => $para),
		3155	w => 1e10,
		3156	wrapped => 1,
		3157	};
		3158
		3159	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3160	push @{$self->{par}}, $para;
		3161	}
		3162
		3163	if (my $max = $self->{max_par}) {
		3164	shift @{$self->{par}} while @{$self->{par}} > $max;
		3165	}
		3166
		3167	$self->{need_reflow}++;
		3168	$self->update;
		3169	}
		3170
		3171	sub scroll_to_bottom {
		3172	my ($self) = @_;
		3173
		3174	$self->{scroll_to} = $#{$self->{par}};
		3175	$self->update;
		3176	}
		3177
		3178	sub force_uptodate {
		3179	my ($self) = @_;
		3180
		3181	if (delete $self->{need_reflow}) {
		3182	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3183
		3184	my $height = 0;
		3185
		3186	for my $para (@{$self->{par}}) {
		3187	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3188	my $layout = $self->get_layout ($para);
		3189	my ($w, $h) = $layout->size;
		3190
		3191	$para->{w} = $w + $para->{indent};
		3192	$para->{h} = $h;
		3193	$para->{wrapped} = $layout->has_wrapped;
		3194	}
		3195
		3196	$para->{y} = $height;
		3197	$height += $para->{h};
		3198	}
		3199
2439	$self->{height} += $h;	3200	$self->{height} = $height;
2440	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3201	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441	}
2442		3202
2443	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3203	delete $self->{texture};
		3204	}
		3205
		3206	if (my $paridx = delete $self->{scroll_to}) {
		3207	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3208	}
2444	}	3209	}
2445		3210
2446	sub update {	3211	sub update {
2447	my ($self) = @_;	3212	my ($self) = @_;
2448		3213
…		…
2450		3215
2451	return unless $self->{h} > 0;	3216	return unless $self->{h} > 0;
2452		3217
2453	delete $self->{texture};	3218	delete $self->{texture};
2454		3219
2455	$ROOT->on_post_alloc ($self, sub {	3220	$ROOT->on_post_alloc ($self => sub {
		3221	$self->force_uptodate;
		3222
2456	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3223	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457		3224
2458	if (delete $self->{need_reflow}) {
2459	my $height = 0;
2460
2461	my $layout = $self->{layout};
2462
2463	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465	for (@{$self->{par}}) {
2466	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467	$layout->set_width ($W - $_->[3]);
2468	$layout->set_markup ($_->[4]);
2469	my ($w, $h) = $layout->size;
2470	$_->[0] = $w + $_->[3];
2471	$_->[1] = $h;
2472	}
2473
2474	$height += $_->[1];
2475	}
2476
2477	$self->{height} = $height;
2478
2479	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480
2481	delete $self->{texture};
2482	}
2483
2484	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3225	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485	glClearColor 0.5, 0.5, 0.5, 0;	3226	glClearColor 0, 0, 0, 0;
2486	glClear GL_COLOR_BUFFER_BIT;	3227	glClear GL_COLOR_BUFFER_BIT;
2487		3228
		3229	package CFPlus::UI::Base;
		3230	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3231	(0, 0, $self->{w}, $self->{h});
		3232
		3233	my $top = int $self->{children}[1]{range}[0];
		3234
		3235	my $paridx = 0;
		3236	my $top_paragraph;
2488	my $top = int $self->{children}[1]{range}[0];	3237	my $top = int $self->{children}[1]{range}[0];
2489		3238
2490	my $y0 = $top;	3239	my $y0 = $top;
2491	my $y1 = $top + $H;	3240	my $y1 = $top + $H;
2492		3241
2493	my $y = 0;
2494
2495	my $layout = $self->{layout};
2496
2497	$layout->set_font ($self->{font}) if $self->{font};
2498
2499	glEnable GL_BLEND;
2500	#TODO# not correct in windows where rgba is forced off
2501	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503	for my $par (@{$self->{par}}) {	3242	for my $para (@{$self->{par}}) {
2504	my $h = $par->[1];	3243	my $h = $para->{h};
		3244	my $y = $para->{y};
2505		3245
2506	if ($y0 < $y + $h && $y < $y1) {	3246	if ($y0 < $y + $h && $y < $y1) {
2507	$layout->set_foreground (@{ $par->[2] });	3247	my $layout = $self->get_layout ($para);
2508	$layout->set_width ($W - $par->[3]);
2509	$layout->set_markup ($par->[4]);
2510		3248
2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3249	$layout->render ($para->{indent}, $y - $y0);
2512		3250
2513	glRasterPos $par->[3], $y - $y0;	3251	if (my @w = @{ $para->{widget} }) {
2514	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3252	my @s = $layout->get_shapes;
		3253
		3254	for (@w) {
		3255	my ($dx, $dy) = splice @s, 0, 2, ();
		3256
		3257	$_->{x} = $dx + $para->{indent};
		3258	$_->{y} = $dy + $y - $y0;
		3259
		3260	$_->draw;
		3261	}
		3262	}
2515	}	3263	}
2516		3264
2517	$y += $h;	3265	$paridx++;
		3266	$top_paragraph ||= $paridx if $y >= $top;
2518	}	3267	}
2519		3268
2520	glDisable GL_BLEND;	3269	$self->{top_paragraph} = $top_paragraph;
2521	};	3270	};
2522	});	3271	});
2523	}	3272	}
2524		3273
		3274	sub reconfigure {
		3275	my ($self) = @_;
		3276
		3277	$self->SUPER::reconfigure;
		3278
		3279	$_->{w} = 1e10 for @{ $self->{par} };
		3280	$self->reflow;
		3281	}
		3282
2525	sub _draw {	3283	sub _draw {
2526	my ($self) = @_;	3284	my ($self) = @_;
2527		3285
2528	glEnable GL_TEXTURE_2D;	3286	glEnable GL_TEXTURE_2D;
2529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3287	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530	glColor 1, 1, 1, 1;	3288	glColor 0, 0, 0, 1;
2531	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3289	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532	glDisable GL_TEXTURE_2D;	3290	glDisable GL_TEXTURE_2D;
2533		3291
2534	$self->{children}[1]->draw;	3292	$self->{children}[1]->draw;
2535
2536	}	3293	}
2537		3294
2538	#############################################################################	3295	#############################################################################
2539		3296
2540	package CFClient::UI::Animator;	3297	package CFPlus::UI::Animator;
2541		3298
2542	use CFClient::OpenGL;	3299	use CFPlus::OpenGL;
2543		3300
2544	our @ISA = CFClient::UI::Bin::;	3301	our @ISA = CFPlus::UI::Bin::;
2545		3302
2546	sub moveto {	3303	sub moveto {
2547	my ($self, $x, $y) = @_;	3304	my ($self, $x, $y) = @_;
2548		3305
2549	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3306	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2577	glPopMatrix;	3334	glPopMatrix;
2578	}	3335	}
2579		3336
2580	#############################################################################	3337	#############################################################################
2581		3338
2582	package CFClient::UI::Flopper;	3339	package CFPlus::UI::Flopper;
2583		3340
2584	our @ISA = CFClient::UI::Button::;	3341	our @ISA = CFPlus::UI::Button::;
2585		3342
2586	sub new {	3343	sub new {
2587	my $class = shift;	3344	my $class = shift;
2588		3345
2589	my $self = $class->SUPER::new (	3346	my $self = $class->SUPER::new (
…		…
2601	$self->{other}->toggle_visibility;	3358	$self->{other}->toggle_visibility;
2602	}	3359	}
2603		3360
2604	#############################################################################	3361	#############################################################################
2605		3362
2606	package CFClient::UI::Tooltip;	3363	package CFPlus::UI::Tooltip;
2607		3364
2608	our @ISA = CFClient::UI::Bin::;	3365	our @ISA = CFPlus::UI::Bin::;
2609		3366
2610	use CFClient::OpenGL;	3367	use CFPlus::OpenGL;
2611		3368
2612	sub new {	3369	sub new {
2613	my $class = shift;	3370	my $class = shift;
2614		3371
2615	$class->SUPER::new (	3372	$class->SUPER::new (
…		…
2618	)	3375	)
2619	}	3376	}
2620		3377
2621	sub set_tooltip_from {	3378	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	3379	my ($self, $widget) = @_;
		3380
		3381	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3382	if $widget->{tooltip} =~ /^#(.*)$/;
2623		3383
2624	my $tooltip = $widget->{tooltip};	3384	my $tooltip = $widget->{tooltip};
2625		3385
2626	if ($ENV{CFPLUS_DEBUG} & 2) {	3386	if ($ENV{CFPLUS_DEBUG} & 2) {
2627	$tooltip .= "\n\n" . (ref $widget) . "\n"	3387	$tooltip .= "\n\n" . (ref $widget) . "\n"
2628	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3388	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629	. "req $widget->{req_w} $widget->{req_h}\n"	3389	. "req $widget->{req_w} $widget->{req_h}\n"
2630	. "visible $widget->{visible}";	3390	. "visible $widget->{visible}";
2631	}	3391	}
2632		3392
		3393	$tooltip =~ s/^\n+//;
		3394	$tooltip =~ s/\n+$//;
		3395
2633	$self->add (new CFClient::UI::Label	3396	$self->add (new CFPlus::UI::Label
2634	markup => $tooltip,	3397	markup => $tooltip,
2635	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3398	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636	fontsize => 0.8,	3399	fontsize => 0.8,
2637	fg => [0, 0, 0, 1],	3400	style => 1, # FLAG_INVERSE
2638	ellipsise => 0,	3401	ellipsise => 0,
2639	font => ($widget->{tooltip_font} || $::FONT_PROP),	3402	font => ($widget->{tooltip_font} || $::FONT_PROP),
2640	);	3403	);
2641	}	3404	}
2642		3405
…		…
2646	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3409	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647		3410
2648	($w + 4, $h + 4)	3411	($w + 4, $h + 4)
2649	}	3412	}
2650		3413
2651	sub size_allocate {	3414	sub invoke_size_allocate {
2652	my ($self, $w, $h) = @_;	3415	my ($self, $w, $h) = @_;
2653		3416
2654	$self->SUPER::size_allocate ($w - 4, $h - 4);	3417	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655	}	3418	}
2656		3419
2657	sub visibility_change {	3420	sub invoke_visibility_change {
2658	my ($self, $visible) = @_;	3421	my ($self, $visible) = @_;
2659		3422
2660	return unless $visible;	3423	return unless $visible;
2661		3424
2662	$self->{root}->on_post_alloc ("move_$self" => sub {	3425	$self->{root}->on_post_alloc ("move_$self" => sub {
2663	my $widget = $self->{owner}	3426	my $widget = $self->{owner}
2664	or return;	3427	or return;
2665		3428
		3429	if ($widget->{visible}) {
2666	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3430	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667		3431
2668	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3432	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669	if $x + $self->{w} > $::WIDTH;	3433	if $x + $self->{w} > $self->{root}{w};
2670		3434
2671	$self->move_abs ($x, $y);	3435	$self->move_abs ($x, $y);
		3436	} else {
		3437	$self->hide;
		3438	}
2672	});	3439	});
2673	}	3440	}
2674		3441
2675	sub _draw {	3442	sub _draw {
2676	my ($self) = @_;	3443	my ($self) = @_;
…		…
2700	$self->SUPER::_draw;	3467	$self->SUPER::_draw;
2701	}	3468	}
2702		3469
2703	#############################################################################	3470	#############################################################################
2704		3471
2705	package CFClient::UI::Face;	3472	package CFPlus::UI::Face;
2706		3473
2707	our @ISA = CFClient::UI::Base::;	3474	our @ISA = CFPlus::UI::DrawBG::;
2708		3475
2709	use CFClient::OpenGL;	3476	use CFPlus::OpenGL;
2710		3477
2711	sub new {	3478	sub new {
2712	my $class = shift;	3479	my $class = shift;
2713		3480
2714	my $self = $class->SUPER::new (	3481	my $self = $class->SUPER::new (
		3482	size_w => 32,
		3483	size_h => 8,
2715	aspect => 1,	3484	aspect => 1,
2716	can_events => 0,	3485	can_events => 0,
2717	@_,	3486	@_,
2718	);	3487	);
2719		3488
2720	if ($self->{anim} && $self->{animspeed}) {	3489	if ($self->{anim} && $self->{animspeed}) {
2721	Scalar::Util::weaken (my $widget = $self);	3490	CFPlus::weaken (my $widget = $self);
2722		3491
2723	$self->{timer} = Event->timer (	3492	$self->{timer} = Event->timer (
2724	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3493	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725	hard => 1,	3494	hard => 1,
2726	interval => $self->{animspeed},	3495	interval => $self->{animspeed},
2727	cb => sub {	3496	cb => sub {
		3497	return unless $::CONN;
		3498
2728	++$widget->{frame};	3499	++$widget->{frame};
		3500	$self->update_face;
2729	$widget->update;	3501	$self->update;
2730	},	3502	},
2731	);	3503	);
		3504
		3505	$self->update_face;
2732	}	3506	}
2733		3507
2734	$self	3508	$self
2735	}	3509	}
2736		3510
		3511	sub update_face {
		3512	my ($self) = @_;
		3513
		3514	return unless $::CONN;
		3515
		3516	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3517	if ($anim && @$anim) {
		3518	delete $self->{wait_face};
		3519	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3520	}
		3521	}
		3522	}
		3523
2737	sub size_request {	3524	sub size_request {
2738	(32, 8)	3525	my ($self) = @_;
		3526
		3527	if ($::CONN) {
		3528	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3529	if (my $tex = $::CONN->{texture}[$faceid]) {
		3530	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3531	} else {
		3532	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3533	$self->realloc;
		3534	});
		3535	}
		3536	}
		3537	}
		3538
		3539	($self->{size_w} || 8, $self->{size_h} || 8)
2739	}	3540	}
2740		3541
2741	sub update {	3542	sub update {
2742	my ($self) = @_;	3543	my ($self) = @_;
2743		3544
…		…
2749	sub _draw {	3550	sub _draw {
2750	my ($self) = @_;	3551	my ($self) = @_;
2751		3552
2752	return unless $::CONN;	3553	return unless $::CONN;
2753		3554
2754	my $face;	3555	$self->SUPER::_draw;
2755		3556
2756	if ($self->{frame}) {
2757	my $anim = $::CONN->{anim}[$self->{anim}];	3557	my $faceid = $::CONN->{faceid}[$self->{face}]
2758		3558	or return;
2759	$face = $anim->[ $self->{frame} % @$anim ]
2760	if $anim && @$anim;
2761	}
2762		3559
2763	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3560	my $tex = $::CONN->{texture}[$faceid];
2764		3561
2765	if ($tex) {	3562	if ($tex) {
2766	glEnable GL_TEXTURE_2D;	3563	glEnable GL_TEXTURE_2D;
2767	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768	glColor 1, 1, 1, 1;	3565	glColor 0, 0, 0, 1;
2769	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3566	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770	glDisable GL_TEXTURE_2D;	3567	glDisable GL_TEXTURE_2D;
2771	}	3568	}
2772	}	3569	}
2773		3570
2774	sub DESTROY {	3571	sub destroy {
2775	my ($self) = @_;	3572	my ($self) = @_;
2776		3573
2777	$self->{timer}->cancel	3574	$self->{timer}->cancel
2778	if $self->{timer};	3575	if $self->{timer};
2779		3576
2780	$self->SUPER::DESTROY;	3577	$self->SUPER::destroy;
2781	}	3578	}
2782		3579
2783	#############################################################################	3580	#############################################################################
2784		3581
2785	package CFClient::UI::Inventory;	3582	package CFPlus::UI::Buttonbar;
2786		3583
2787	our @ISA = CFClient::UI::ScrolledWindow::;	3584	our @ISA = CFPlus::UI::HBox::;
2788		3585
2789	sub new {	3586	# TODO: should actually wrap buttons and other goodies.
2790	my $class = shift;
2791
2792	my $self = $class->SUPER::new (
2793	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794	@_,
2795	);
2796
2797	$self
2798	}
2799
2800	sub set_items {
2801	my ($self, $items) = @_;
2802
2803	$self->{scrolled}->clear;
2804	return unless $items;
2805
2806	my @items = sort {
2807	($a->{type} <=> $b->{type})
2808	or ($a->{name} cmp $b->{name})
2809	} @$items;
2810
2811	$self->{real_items} = \@items;
2812
2813	my $row = 0;
2814	for my $item (@items) {
2815	CFClient::Item::update_widgets $item;
2816
2817	$self->{scrolled}->add (0, $row, $item->{face_widget});
2818	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2819	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821	$row++;
2822	}
2823	}
2824		3587
2825	#############################################################################	3588	#############################################################################
2826		3589
2827	package CFClient::UI::Menu;	3590	package CFPlus::UI::Menu;
2828		3591
2829	our @ISA = CFClient::UI::FancyFrame::;	3592	our @ISA = CFPlus::UI::Toplevel::;
2830		3593
2831	use CFClient::OpenGL;	3594	use CFPlus::OpenGL;
2832		3595
2833	sub new {	3596	sub new {
2834	my $class = shift;	3597	my $class = shift;
2835		3598
2836	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
2837	items => [],	3600	items => [],
2838	z => 100,	3601	z => 100,
2839	@_,	3602	@_,
2840	);	3603	);
2841		3604
2842	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3605	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2843		3606
2844	for my $item (@{ $self->{items} }) {	3607	for my $item (@{ $self->{items} }) {
2845	my ($widget, $cb) = @$item;	3608	my ($widget, $cb, $tooltip) = @$item;
2846		3609
2847	# handle various types of items, only text for now	3610	# handle various types of items, only text for now
2848	if (!ref $widget) {	3611	if (!ref $widget) {
		3612	if ($widget =~ /\t/) {
		3613	my ($left, $right) = split /\t/, $widget, 2;
		3614
2849	$widget = new CFClient::UI::Label	3615	$widget = new CFPlus::UI::HBox
2850	can_hover => 1,	3616	can_hover => 1,
2851	can_events => 1,	3617	can_events => 1,
		3618	tooltip => $tooltip,
		3619	children => [
		3620	(new CFPlus::UI::Label markup => $left, expand => 1),
		3621	(new CFPlus::UI::Label markup => $right, align => +1),
		3622	],
		3623	;
		3624
		3625	} else {
		3626	$widget = new CFPlus::UI::Label
		3627	can_hover => 1,
		3628	can_events => 1,
2852	text => $widget;	3629	markup => $widget,
		3630	tooltip => $tooltip;
		3631	}
2853	}	3632	}
2854		3633
2855	$self->{item}{$widget} = $item;	3634	$self->{item}{$widget} = $item;
2856		3635
2857	$self->{vbox}->add ($widget);	3636	$self->{vbox}->add ($widget);
…		…
2862		3641
2863	# popup given the event (must be a mouse button down event currently)	3642	# popup given the event (must be a mouse button down event currently)
2864	sub popup {	3643	sub popup {
2865	my ($self, $ev) = @_;	3644	my ($self, $ev) = @_;
2866		3645
2867	$self->_emit ("popdown");	3646	$self->emit ("popdown");
2868		3647
2869	# maybe save $GRAB? must be careful about events...	3648	# maybe save $GRAB? must be careful about events...
2870	$GRAB = $self;	3649	$GRAB = $self;
2871	$self->{button} = $ev->{button};	3650	$self->{button} = $ev->{button};
2872		3651
2873	$self->show;	3652	$self->show;
2874	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3653	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875	}	3654	}
2876		3655
2877	sub mouse_motion {	3656	sub invoke_mouse_motion {
2878	my ($self, $ev, $x, $y) = @_;	3657	my ($self, $ev, $x, $y) = @_;
2879		3658
2880	# TODO: should use vbox->find_widget or so	3659	# TODO: should use vbox->find_widget or so
2881	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3660	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882	$self->{hover} = $self->{item}{$HOVER};	3661	$self->{hover} = $self->{item}{$HOVER};
2883	}
2884		3662
		3663	0
		3664	}
		3665
2885	sub button_up {	3666	sub invoke_button_up {
2886	my ($self, $ev, $x, $y) = @_;	3667	my ($self, $ev, $x, $y) = @_;
2887		3668
2888	if ($ev->{button} == $self->{button}) {	3669	if ($ev->{button} == $self->{button}) {
2889	undef $GRAB;	3670	undef $GRAB;
2890	$self->hide;	3671	$self->hide;
2891		3672
2892	$self->_emit ("popdown");	3673	$self->emit ("popdown");
2893	$self->{hover}[1]->() if $self->{hover};	3674	$self->{hover}[1]->() if $self->{hover};
		3675	} else {
		3676	return 0
		3677	}
		3678
2894	}	3679	1
2895	}	3680	}
2896		3681
2897	#############################################################################	3682	#############################################################################
2898		3683
2899	package CFClient::UI::Statusbox;	3684	package CFPlus::UI::Multiplexer;
2900		3685
2901	our @ISA = CFClient::UI::VBox::;	3686	our @ISA = CFPlus::UI::Container::;
2902		3687
2903	sub new {	3688	sub new {
2904	my $class = shift;	3689	my $class = shift;
2905		3690
2906	$class->SUPER::new (	3691	my $self = $class->SUPER::new (
		3692	@_,
		3693	);
		3694
		3695	$self->{current} = $self->{children}[0]
		3696	if @{ $self->{children} };
		3697
		3698	$self
		3699	}
		3700
		3701	sub add {
		3702	my ($self, @widgets) = @_;
		3703
		3704	$self->SUPER::add (@widgets);
		3705
		3706	$self->{current} = $self->{children}[0]
		3707	if @{ $self->{children} };
		3708	}
		3709
		3710	sub get_current_page {
		3711	my ($self) = @_;
		3712
		3713	$self->{current}
		3714	}
		3715
		3716	sub set_current_page {
		3717	my ($self, $page_or_widget) = @_;
		3718
		3719	my $widget = ref $page_or_widget
		3720	? $page_or_widget
		3721	: $self->{children}[$page_or_widget];
		3722
		3723	$self->{current} = $widget;
		3724	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3725
		3726	$self->emit (page_changed => $self->{current});
		3727
		3728	$self->realloc;
		3729	}
		3730
		3731	sub visible_children {
		3732	$_[0]{current}
		3733	}
		3734
		3735	sub size_request {
		3736	my ($self) = @_;
		3737
		3738	$self->{current}->size_request
		3739	}
		3740
		3741	sub invoke_size_allocate {
		3742	my ($self, $w, $h) = @_;
		3743
		3744	$self->{current}->configure (0, 0, $w, $h);
		3745
		3746	1
		3747	}
		3748
		3749	sub _draw {
		3750	my ($self) = @_;
		3751
		3752	$self->{current}->draw;
		3753	}
		3754
		3755	#############################################################################
		3756
		3757	package CFPlus::UI::Notebook;
		3758
		3759	our @ISA = CFPlus::UI::VBox::;
		3760
		3761	sub new {
		3762	my $class = shift;
		3763
		3764	my $self = $class->SUPER::new (
		3765	buttonbar => (new CFPlus::UI::Buttonbar),
		3766	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3767	# filter => # will be put between multiplexer and $self
		3768	@_,
		3769	);
		3770
		3771	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3772	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3773
		3774	$self
		3775	}
		3776
		3777	sub add {
		3778	my ($self, $title, $widget, $tooltip) = @_;
		3779
		3780	CFPlus::weaken $self;
		3781
		3782	$self->{buttonbar}->add (new CFPlus::UI::Button
		3783	markup => $title,
		3784	tooltip => $tooltip,
		3785	on_activate => sub { $self->set_current_page ($widget) },
		3786	);
		3787
		3788	$self->{multiplexer}->add ($widget);
		3789	}
		3790
		3791	sub get_current_page {
		3792	my ($self) = @_;
		3793
		3794	$self->{multiplexer}->get_current_page
		3795	}
		3796
		3797	sub set_current_page {
		3798	my ($self, $page) = @_;
		3799
		3800	$self->{multiplexer}->set_current_page ($page);
		3801	$self->emit (page_changed => $self->{multiplexer}{current});
		3802	}
		3803
		3804	#############################################################################
		3805
		3806	package CFPlus::UI::Selector;
		3807
		3808	use utf8;
		3809
		3810	our @ISA = CFPlus::UI::Button::;
		3811
		3812	sub new {
		3813	my $class = shift;
		3814
		3815	my $self = $class->SUPER::new (
		3816	options => [], # [value, title, longdesc], ...
		3817	value => undef,
		3818	@_,
		3819	);
		3820
		3821	$self->_set_value ($self->{value});
		3822
		3823	$self
		3824	}
		3825
		3826	sub invoke_button_down {
		3827	my ($self, $ev) = @_;
		3828
		3829	my @menu_items;
		3830
		3831	for (@{ $self->{options} }) {
		3832	my ($value, $title, $tooltip) = @$_;
		3833
		3834	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3835	}
		3836
		3837	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3838	}
		3839
		3840	sub _set_value {
		3841	my ($self, $value) = @_;
		3842
		3843	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3844	or return;
		3845
		3846	$self->{value} = $item->[0];
		3847	$self->set_markup ("$item->[1] ⇓");
		3848	$self->set_tooltip ($item->[2]);
		3849	}
		3850
		3851	sub set_value {
		3852	my ($self, $value) = @_;
		3853
		3854	return unless $self->{value} ne $value;
		3855
		3856	$self->_set_value ($value);
		3857	$self->emit (changed => $value);
		3858	}
		3859
		3860	#############################################################################
		3861
		3862	package CFPlus::UI::Statusbox;
		3863
		3864	our @ISA = CFPlus::UI::VBox::;
		3865
		3866	sub new {
		3867	my $class = shift;
		3868
		3869	my $self = $class->SUPER::new (
2907	fontsize => 0.8,	3870	fontsize => 0.8,
2908	@_,	3871	@_,
2909	)	3872	);
		3873
		3874	CFPlus::weaken (my $this = $self);
		3875
		3876	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3877
		3878	$self
2910	}	3879	}
2911		3880
2912	sub reorder {	3881	sub reorder {
2913	my ($self) = @_;	3882	my ($self) = @_;
2914	my $NOW = time;	3883	my $NOW = Time::HiRes::time;
		3884
		3885	# freeze display when hovering over any label
		3886	return if $CFPlus::UI::TOOLTIP->{owner}
		3887	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3888	values %{ $self->{item} };
2915		3889
2916	while (my ($k, $v) = each %{ $self->{item} }) {	3890	while (my ($k, $v) = each %{ $self->{item} }) {
2917	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3891	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918	}	3892	}
2919		3893
…		…
2922	my @items = sort {	3896	my @items = sort {
2923	$a->{pri} <=> $b->{pri}	3897	$a->{pri} <=> $b->{pri}
2924	or $b->{id} <=> $a->{id}	3898	or $b->{id} <=> $a->{id}
2925	} values %{ $self->{item} };	3899	} values %{ $self->{item} };
2926		3900
		3901	$self->{timer}->interval (1);
		3902
2927	my $count = 10 + 1;	3903	my $count = 10 + 1;
2928	for my $item (@items) {	3904	for my $item (@items) {
2929	last unless --$count;	3905	last unless --$count;
2930		3906
2931	push @widgets, $item->{label} ||= do {	3907	my $label = $item->{label} ||= do {
2932	# TODO: doesn't handle markup well (read as: at all)	3908	# TODO: doesn't handle markup well (read as: at all)
2933	my $short = $item->{count} > 1	3909	my $short = $item->{count} > 1
2934	? "<b>$item->{count} ×</b> $item->{text}"	3910	? "<b>$item->{count} ×</b> $item->{text}"
2935	: $item->{text};	3911	: $item->{text};
2936		3912
2937	for ($short) {	3913	for ($short) {
2938	s/^\s+//;	3914	s/^\s+//;
2939	s/\s+/ /g;	3915	s/\s+/ /g;
2940	}	3916	}
2941		3917
2942	new CFClient::UI::Label	3918	new CFPlus::UI::Label
2943	markup => $short,	3919	markup => $short,
2944	tooltip => $item->{tooltip},	3920	tooltip => $item->{tooltip},
2945	tooltip_font => $::FONT_PROP,	3921	tooltip_font => $::FONT_PROP,
2946	tooltip_width => 0.67,	3922	tooltip_width => 0.67,
2947	fontsize => $item->{fontsize} || $self->{fontsize},	3923	fontsize => $item->{fontsize} || $self->{fontsize},
2948	max_w => $::WIDTH * 0.44,	3924	max_w => $::WIDTH * 0.44,
2949	fg => $item->{fg},	3925	fg => [@{ $item->{fg} }],
2950	can_events => 1,	3926	can_events => 1,
2951	can_hover => 1	3927	can_hover => 1
2952	};	3928	};
		3929
		3930	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3931	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3932	$label->update;
		3933	$label->set_max_size (undef, $label->{req_h} * $diff)
		3934	if $diff < 1;
		3935	$self->{timer}->interval (1/30);
		3936	} else {
		3937	$label->{fg}[3] = $item->{fg}[3] || 1;
		3938	}
		3939
		3940	push @widgets, $label;
2953	}	3941	}
2954		3942
2955	$self->clear;	3943	$self->clear;
2956	$self->SUPER::add (reverse @widgets);	3944	$self->SUPER::add (reverse @widgets);
2957	}	3945	}
…		…
2962	$text =~ s/^\s+//;	3950	$text =~ s/^\s+//;
2963	$text =~ s/\s+$//;	3951	$text =~ s/\s+$//;
2964		3952
2965	return unless $text;	3953	return unless $text;
2966		3954
2967	my $timeout = time + ((delete $arg{timeout}) || 60);	3955	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968		3956
2969	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3957	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970		3958
2971	if (my $item = $self->{item}{$group}) {	3959	if (my $item = $self->{item}{$group}) {
2972	if ($item->{text} eq $text) {	3960	if ($item->{text} eq $text) {
2973	$item->{count}++;	3961	$item->{count}++;
2974	} else {	3962	} else {
2975	$item->{count} = 1;	3963	$item->{count} = 1;
2976	$item->{text} = $item->{tooltip} = $text;	3964	$item->{text} = $item->{tooltip} = $text;
2977	}	3965	}
2978	$item->{id} = ++$self->{id};	3966	$item->{id} += 0.2;#d#
2979	$item->{timeout} = $timeout;	3967	$item->{timeout} = $timeout;
2980	delete $item->{label};	3968	delete $item->{label};
2981	} else {	3969	} else {
2982	$self->{item}{$group} = {	3970	$self->{item}{$group} = {
2983	id => ++$self->{id},	3971	id => ++$self->{id},
…		…
2989	count => 1,	3977	count => 1,
2990	%arg,	3978	%arg,
2991	};	3979	};
2992	}	3980	}
2993		3981
		3982	$ROOT->on_refresh (reorder => sub {
2994	$self->reorder;	3983	$self->reorder;
		3984	});
2995	}	3985	}
2996		3986
2997	sub reconfigure {	3987	sub reconfigure {
2998	my ($self) = @_;	3988	my ($self) = @_;
2999		3989
…		…
3002		3992
3003	$self->reorder;	3993	$self->reorder;
3004	$self->SUPER::reconfigure;	3994	$self->SUPER::reconfigure;
3005	}	3995	}
3006		3996
		3997	sub destroy {
		3998	my ($self) = @_;
		3999
		4000	$self->{timer}->cancel;
		4001
		4002	$self->SUPER::destroy;
		4003	}
		4004
3007	#############################################################################	4005	#############################################################################
3008		4006
3009	package CFClient::UI::Root;	4007	package CFPlus::UI::Root;
3010		4008
3011	our @ISA = CFClient::UI::Container::;	4009	our @ISA = CFPlus::UI::Container::;
3012		4010
		4011	use List::Util qw(min max);
		4012
3013	use CFClient::OpenGL;	4013	use CFPlus::OpenGL;
3014		4014
3015	sub new {	4015	sub new {
3016	my $class = shift;	4016	my $class = shift;
3017		4017
3018	my $self = $class->SUPER::new (	4018	my $self = $class->SUPER::new (
3019	visible => 1,	4019	visible => 1,
3020	@_,	4020	@_,
3021	);	4021	);
3022		4022
3023	Scalar::Util::weaken ($self->{root} = $self);	4023	CFPlus::weaken ($self->{root} = $self);
3024		4024
3025	$self	4025	$self
3026	}	4026	}
3027		4027
3028	sub size_request {	4028	sub size_request {
…		…
3043	$coord = $max - $size if $coord > $max - $size;	4043	$coord = $max - $size if $coord > $max - $size;
3044		4044
3045	int $coord + 0.5	4045	int $coord + 0.5
3046	}	4046	}
3047		4047
3048	sub size_allocate {	4048	sub invoke_size_allocate {
3049	my ($self, $w, $h) = @_;	4049	my ($self, $w, $h) = @_;
3050		4050
3051	for my $child ($self->children) {	4051	for my $child ($self->children) {
3052	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4052	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053		4053
…		…
3057	$X = _to_pixel $X, $W, $self->{w};	4057	$X = _to_pixel $X, $W, $self->{w};
3058	$Y = _to_pixel $Y, $H, $self->{h};	4058	$Y = _to_pixel $Y, $H, $self->{h};
3059		4059
3060	$child->configure ($X, $Y, $W, $H);	4060	$child->configure ($X, $Y, $W, $H);
3061	}	4061	}
		4062
		4063	1
3062	}	4064	}
3063		4065
3064	sub coord2local {	4066	sub coord2local {
3065	my ($self, $x, $y) = @_;	4067	my ($self, $x, $y) = @_;
3066		4068
…		…
3122	$_->()	4124	$_->()
3123	for values %{delete $self->{refresh_hook}};	4125	for values %{delete $self->{refresh_hook}};
3124	}	4126	}
3125		4127
3126	if ($self->{realloc}) {	4128	if ($self->{realloc}) {
		4129	my %queue;
3127	my @queue;	4130	my @queue;
		4131	my $widget;
3128		4132
		4133	outer:
3129	while () {	4134	while () {
3130	if ($self->{realloc}) {	4135	if (my $realloc = delete $self->{realloc}) {
3131	#TODO use array-of-depth approach	4136	for $widget (values %$realloc) {
		4137	$widget->{visible} or next; # do not resize invisible widgets
3132		4138
3133	use sort 'stable';	4139	$queue{$widget+0}++ and next; # duplicates are common
3134		4140
3135	@queue = sort { $a->{visible} <=> $b->{visible} }	4141	push @{ $queue[$widget->{visible}] }, $widget;
3136	@queue, values %{delete $self->{realloc}};	4142	}
3137	}	4143	}
3138		4144
		4145	while () {
		4146	@queue or last outer;
		4147
3139	my $widget = pop @queue || last;	4148	$widget = pop @{ $queue[-1] || [] }
		4149	and last;
		4150
		4151	pop @queue;
		4152	}
3140		4153
3141	$widget->{visible} or last; # do not resize invisible widgets	4154	delete $queue{$widget+0};
3142		4155
3143	my ($w, $h) = $widget->size_request;	4156	my ($w, $h) = $widget->size_request;
3144		4157
3145	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4158	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4159	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4160
		4161	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4162	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147		4163
3148	$w = $widget->{force_w} if exists $widget->{force_w};	4164	$w = $widget->{force_w} if exists $widget->{force_w};
3149	$h = $widget->{force_h} if exists $widget->{force_h};	4165	$h = $widget->{force_h} if exists $widget->{force_h};
3150		4166
3151	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4167	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3154	$widget->{req_h} = $h;	4170	$widget->{req_h} = $h;
3155		4171
3156	$self->{size_alloc}{$widget+0} = $widget;	4172	$self->{size_alloc}{$widget+0} = $widget;
3157		4173
3158	if (my $parent = $widget->{parent}) {	4174	if (my $parent = $widget->{parent}) {
3159	$self->{realloc}{$parent+0} = $parent;	4175	$self->{realloc}{$parent+0} = $parent
3160	#unshift @queue, $parent;	4176	unless $queue{$parent+0};
		4177
3161	$parent->{force_size_alloc} = 1;	4178	$parent->{force_size_alloc} = 1;
3162	$self->{size_alloc}{$parent+0} = $parent;	4179	$self->{size_alloc}{$parent+0} = $parent;
3163	}	4180	}
3164	}	4181	}
3165		4182
…		…
3177	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4194	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178		4195
3179	$w = 0 if $w < 0;	4196	$w = 0 if $w < 0;
3180	$h = 0 if $h < 0;	4197	$h = 0 if $h < 0;
3181		4198
		4199	$w = max $widget->{min_w}, $w;
		4200	$h = max $widget->{min_h}, $h;
		4201
		4202	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4203	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4204
		4205	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4206	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4207
3182	$w = int $w + 0.5;	4208	$w = int $w + 0.5;
3183	$h = int $h + 0.5;	4209	$h = int $h + 0.5;
3184		4210
3185	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4211	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4212	$widget->{old_w} = $widget->{w};
		4213	$widget->{old_h} = $widget->{h};
		4214
3186	$widget->{w} = $w;	4215	$widget->{w} = $w;
3187	$widget->{h} = $h;	4216	$widget->{h} = $h;
3188		4217
3189	$widget->emit (size_allocate => $w, $h);	4218	$widget->emit (size_allocate => $w, $h);
3190	}	4219	}
…		…
3205	glLoadIdentity;	4234	glLoadIdentity;
3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4235	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207	glMatrixMode GL_MODELVIEW;	4236	glMatrixMode GL_MODELVIEW;
3208	glLoadIdentity;	4237	glLoadIdentity;
3209		4238
		4239	{
		4240	package CFPlus::UI::Base;
		4241
		4242	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4243	(0, 0, $self->{w}, $self->{h});
		4244
3210	$self->_draw;	4245	$self->_draw;
		4246	}
3211	}	4247	}
3212		4248
3213	#############################################################################	4249	#############################################################################
3214		4250
3215	package CFClient::UI::BindEditor;
3216
3217	our @ISA = CFClient::UI::FancyFrame::;
3218
3219	sub new {
3220	my $class = shift;
3221
3222	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224	$self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228	text => "start recording",
3229	tooltip => "Start/Stops recording of actions."
3230	."All subsequent actions after the recording started will be captured."
3231	."The actions are displayed after the record was stopped."
3232	."To bind the action you have to click on the 'Bind' button",
3233	on_activate => sub {
3234	unless ($self->{recording}) {
3235	$self->start;
3236	} else {
3237	$self->stop;
3238	}
3239	});
3240
3241	$vb->add (new CFClient::UI::Label text => "Actions:");
3242	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3245	$vb->add (my $hb = new CFClient::UI::HBox);
3246	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247	$hb->add (new CFClient::UI::Button
3248	text => "bind",
3249	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250	on_activate => sub {
3251	$self->ask_for_bind;
3252	});
3253
3254	$vb->add (my $hb = new CFClient::UI::HBox);
3255	$hb->add (new CFClient::UI::Button
3256	text => "ok",
3257	expand => 1,
3258	tooltip => "This closes the binding editor and saves the binding",
3259	on_activate => sub {
3260	$self->hide;
3261	$self->commit;
3262	});
3263
3264	$hb->add (new CFClient::UI::Button
3265	text => "cancel",
3266	expand => 1,
3267	tooltip => "This closes the binding editor without saving",
3268	on_activate => sub {
3269	$self->hide;
3270	$self->{binding_cancel}->()
3271	if $self->{binding_cancel};
3272	});
3273
3274	$self->update_binding_widgets;
3275
3276	$self
3277	}
3278
3279	sub commit {
3280	my ($self) = @_;
3281	my ($mod, $sym, $cmds) = $self->get_binding;
3282	if ($sym != 0 && @$cmds > 0) {
3283	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284	."'. Don't forget 'Save Config'!");
3285	$self->{binding_change}->($mod, $sym, $cmds)
3286	if $self->{binding_change};
3287	} else {
3288	$::STATUSBOX->add ("No action bound, no key or action specified!");
3289	$self->{binding_cancel}->()
3290	if $self->{binding_cancel};
3291	}
3292	}
3293
3294	sub start {
3295	my ($self) = @_;
3296
3297	$self->{rec_btn}->set_text ("stop recording");
3298	$self->{recording} = 1;
3299	$self->clear_command_list;
3300	$::CONN->start_record if $::CONN;
3301	}
3302
3303	sub stop {
3304	my ($self) = @_;
3305
3306	$self->{rec_btn}->set_text ("start recording");
3307	$self->{recording} = 0;
3308
3309	my $rec;
3310	$rec = $::CONN->stop_record if $::CONN;
3311	return unless ref $rec eq 'ARRAY';
3312	$self->set_command_list ($rec);
3313	}
3314
3315	# if $commit is true, the binding will be set after the user entered a key combo
3316	sub ask_for_bind {
3317	my ($self, $commit) = @_;
3318
3319	CFClient::Binder::open_binding_dialog (sub {
3320	my ($mod, $sym) = @_;
3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322	$self->update_binding_widgets;
3323	$self->commit if $commit;
3324	});
3325	}
3326
3327	# $mod and $sym are the modifiers and key symbol
3328	# $cmds is a array ref of strings (the commands)
3329	# $cb is the callback that is executed on OK
3330	# $ccb is the callback that is executed on CANCEL and
3331	# when the binding was unsuccessful on OK
3332	sub set_binding {
3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335	$self->clear_command_list;
3336	$self->{recording} = 0;
3337	$self->{rec_btn}->set_text ("start recording");
3338
3339	$self->{binding} = [$mod, $sym];
3340	$self->{commands} = $cmds;
3341
3342	$self->{binding_change} = $cb;
3343	$self->{binding_cancel} = $ccb;
3344
3345	$self->update_binding_widgets;
3346	}
3347
3348	# this is a shortcut method that asks for a binding
3349	# and then just binds it.
3350	sub do_quick_binding {
3351	my ($self, $cmds) = @_;
3352	$self->set_binding (undef, undef, $cmds, sub {
3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354	});
3355	$self->ask_for_bind (1);
3356	}
3357
3358	sub update_binding_widgets {
3359	my ($self) = @_;
3360	my ($mod, $sym, $cmds) = $self->get_binding;
3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362	$self->set_command_list ($cmds);
3363	}
3364
3365	sub get_binding {
3366	my ($self) = @_;
3367	return (
3368	$self->{binding}->[0],
3369	$self->{binding}->[1],
3370	[ grep { defined $_ } @{$self->{commands}} ]
3371	);
3372	}
3373
3374	sub clear_command_list {
3375	my ($self) = @_;
3376	$self->{cmdbox}->clear ();
3377	}
3378
3379	sub set_command_list {
3380	my ($self, $cmds) = @_;
3381
3382	$self->{cmdbox}->clear ();
3383	$self->{commands} = $cmds;
3384
3385	my $idx = 0;
3386
3387	for (@$cmds) {
3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390	my $i = $idx;
3391	$hb->add (new CFClient::UI::Label text => $_);
3392	$hb->add (new CFClient::UI::Button
3393	text => "delete",
3394	tooltip => "Deletes the action from the record",
3395	on_activate => sub {
3396	$self->{cmdbox}->remove ($hb);
3397	$cmds->[$i] = undef;
3398	});
3399
3400
3401	$idx++
3402	}
3403	}
3404
3405
3406	#############################################################################
3407
3408	package CFClient::UI::SpellList;
3409
3410	our @ISA = CFClient::UI::FancyFrame::;
3411
3412	sub new {
3413	my $class = shift;
3414
3415	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417	$self->add (new CFClient::UI::ScrolledWindow
3418	scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420	$self;
3421	}
3422
3423	# XXX: Do sorting? Argl...
3424	sub add_spell {
3425	my ($self, $spell) = @_;
3426	$self->{spells}->{$spell->{name}} = $spell;
3427
3428	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429	face => $spell->{face},
3430	can_hover => 1,
3431	can_events => 1,
3432	tooltip => $spell->{message});
3433
3434	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435	text => $spell->{name},
3436	can_hover => 1,
3437	can_events => 1,
3438	tooltip => $spell->{message},
3439	expand => 1);
3440
3441	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3442	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3443	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3444	expand => 1);
3445
3446	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3447	text => "bind to key",
3448	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3449	}
3450
3451	sub rebuild_spell_list {
3452	my ($self) = @_;
3453	$self->{tbl_idx} = 0;
3454	$self->add_spell ($_) for values %{$self->{spells}};
3455	}
3456
3457	sub remove_spell {
3458	my ($self, $spell) = @_;
3459	delete $self->{spells}->{$spell->{name}};
3460	$self->rebuild_spell_list;
3461	}
3462
3463	#############################################################################
3464
3465	package CFClient::UI;	4251	package CFPlus::UI;
3466		4252
3467	$ROOT = new CFClient::UI::Root;	4253	$ROOT = new CFPlus::UI::Root;
3468	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4254	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3469		4255
3470	1	4256	1
3471		4257

Diff Legend

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