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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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