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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

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

Diff Legend

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