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

Diff Legend

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