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

Diff Legend

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