ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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