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

Diff Legend

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