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.260 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 2007 UTC

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

Diff Legend

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