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

Diff Legend

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