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.393 by root, Sat Jul 21 13:41:46 2007 UTC

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

Diff Legend

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