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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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