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

Diff Legend

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