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

Diff Legend

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