ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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