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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.391 by root, Sat Jul 21 13:33:10 2007 UTC

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

Diff Legend

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