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.72 by root, Tue Apr 11 18:00:45 2006 UTC vs.
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC

1	package CFClient::Widget;	1	package CFClient::UI;
2		2
3	use strict;	3	use strict;
4		4
5	use Scalar::Util;	5	use Scalar::Util ();
6		6	use List::Util ();
7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;
9		7
10	use CFClient;	8	use CFClient;
11		9
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		11
…		…
45		43
46	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47		45
48	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
49		47
50	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51		49
52	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
53	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
54	$grab->update if $grab;	52	$grab->update if $grab;
55	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
70	}	68	}
71		69
72	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73	}	71	}
74		72
		73	#############################################################################
		74
		75	package CFClient::UI::Base;
		76
		77	use strict;
		78
		79	use SDL::OpenGL;
		80
75	sub new {	81	sub new {
76	my $class = shift;	82	my $class = shift;
77		83
78	bless {	84	my $self = bless {
79	x => 0,	85	x => 0,
80	y => 0,	86	y => 0,
81	z => 0,	87	z => 0,
		88	w => -1,
		89	h => -1,
82	@_	90	@_
83	}, $class	91	}, $class;
		92
		93	for (keys %$self) {
		94	if (/^connect_(.*)$/) {
		95	$self->connect ($1 => delete $self->{$_});
		96	}
		97	}
		98
		99	$self
84	}	100	}
85		101
86	sub move {	102	sub move {
87	my ($self, $x, $y, $z) = @_;	103	my ($self, $x, $y, $z) = @_;
88	$self->{x} = $x;	104	$self->{x} = $x;
…		…
97	sub size_request {	113	sub size_request {
98	require Carp;	114	require Carp;
99	Carp::confess "size_request is abtract";	115	Carp::confess "size_request is abtract";
100	}	116	}
101		117
102	sub size_allocate {	118	sub _size_allocate {
103	my ($self, $w, $h) = @_;	119	my ($self, $x, $y, $w, $h) = @_;
		120
		121	$self->{x} = $x;
		122	$self->{y} = $y;
		123
		124	return unless $self->{w} != $w || $self->{h} != $h;
104		125
105	$self->{w} = $w;	126	$self->{w} = $w;
106	$self->{h} = $h;	127	$self->{h} = $h;
107	}
108		128
		129	1
		130	}
		131
		132	sub size_allocate {
		133	my ($self, $x, $y, $w, $h) = @_;
		134
		135	$self->_size_allocate ($x, $y, $w, $h);
		136	}
		137
109	# translate global koordinates to local coordinate system	138	# translate global coordinates to local coordinate system
110	sub translate {	139	sub translate {
111	my ($self, $x, $y) = @_;	140	my ($self, $x, $y) = @_;
112		141
113	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114	}	143	}
115		144
116	sub focus_in {	145	sub focus_in {
117	my ($self) = @_;	146	my ($self) = @_;
118		147
119	return if $FOCUS == $self;	148	return if $FOCUS == $self;
		149	return unless $self->{can_focus};
120		150
121	my $focus = $FOCUS; $FOCUS = $self;	151	my $focus = $FOCUS; $FOCUS = $self;
122	$focus->update if $focus;	152	$focus->update if $focus;
123	$FOCUS->update;	153	$FOCUS->update;
124	}	154	}
…		…
157	glPushMatrix;	187	glPushMatrix;
158	glTranslate $self->{x}, $self->{y}, 0;	188	glTranslate $self->{x}, $self->{y}, 0;
159	$self->_draw;	189	$self->_draw;
160	glPopMatrix;	190	glPopMatrix;
161		191
162	if ($self == $HOVER) {	192	if ($self == $HOVER && $self->{can_hover}) {
163	my ($x, $y) = @$self->{qw(x y)};	193	my ($x, $y) = @$self{qw(x y)};
164		194
165	glColor 1, 1, 1, 0.1;	195	glColor 0, 0, 1, 0.2;
166	glEnable GL_BLEND;	196	glEnable GL_BLEND;
		197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
167	glBegin GL_QUADS;	198	glBegin GL_QUADS;
168	glVertex $x , $y;	199	glVertex $x , $y;
169	glVertex $x + $self->{w}, $y;	200	glVertex $x + $self->{w}, $y;
170	glVertex $x + $self->{w}, $y + $self->{h};	201	glVertex $x + $self->{w}, $y + $self->{h};
171	glVertex $x , $y + $self->{h};	202	glVertex $x , $y + $self->{h};
…		…
178	my ($self) = @_;	209	my ($self) = @_;
179		210
180	warn "no draw defined for $self\n";	211	warn "no draw defined for $self\n";
181	}	212	}
182		213
183	sub bbox {
184	my ($self) = @_;
185	my ($w, $h) = $self->size_request;
186	(
187	$self->{x},
188	$self->{y},
189	$self->{x} = $w,
190	$self->{y} = $h
191	)
192	}
193
194	sub find_widget {	214	sub find_widget {
195	my ($self, $x, $y) = @_;	215	my ($self, $x, $y) = @_;
196		216
197	return $self	217	return $self
198	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	218	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
199	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	219	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
200		220
201	()	221	()
202	}	222	}
203		223
204	sub del_parent { $_[0]->{parent} = undef }
205
206	sub set_parent {	224	sub set_parent {
207	my ($self, $par) = @_;	225	my ($self, $par) = @_;
208		226
209	$self->{parent} = $par;	227	$self->{parent} = $par;
210	Scalar::Util::weaken $self->{parent};	228	Scalar::Util::weaken $self->{parent};
…		…
240	#$self->deactivate;	258	#$self->deactivate;
241	}	259	}
242		260
243	#############################################################################	261	#############################################################################
244		262
245	package CFClient::Widget::DrawBG;	263	package CFClient::UI::DrawBG;
246		264
247	our @ISA = CFClient::Widget::;	265	our @ISA = CFClient::UI::Base::;
248		266
249	use strict;	267	use strict;
250	use SDL::OpenGL;	268	use SDL::OpenGL;
251		269
252	sub new {	270	sub new {
253	my $class = shift;	271	my $class = shift;
254		272
255	# range [value, low, high, page]	273	# range [value, low, high, page]
256		274
257	$class->SUPER::new (	275	$class->SUPER::new (
258	bg => [0, 0, 0, 0.4],	276	bg => [0, 0, 0, 0.2],
259	active_bg => [1, 1, 1],	277	active_bg => [1, 1, 1, 0.5],
260	@_	278	@_
261	)	279	)
262	}	280	}
263		281
264	sub _draw {	282	sub _draw {
265	my ($self) = @_;	283	my ($self) = @_;
266		284
267	my ($w, $h) = @$self{qw(w h)};	285	my ($w, $h) = @$self{qw(w h)};
268		286
		287	glEnable GL_BLEND;
		288	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
269	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	289	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		290
270	glBegin GL_QUADS;	291	glBegin GL_QUADS;
271	glVertex 0 , 0;	292	glVertex 0 , 0;
272	glVertex 0 , $h;	293	glVertex 0 , $h;
273	glVertex $w, $h;	294	glVertex $w, $h;
274	glVertex $w, 0;	295	glVertex $w, 0;
275	glEnd;	296	glEnd;
276	}
277		297
278	#############################################################################	298	glDisable GL_BLEND;
		299	}
279		300
		301	#############################################################################
		302
280	package CFClient::Widget::Empty;	303	package CFClient::UI::Empty;
281		304
282	our @ISA = CFClient::Widget::;	305	our @ISA = CFClient::UI::Base::;
283		306
284	sub size_request {	307	sub size_request {
285	(0, 0)	308	(0, 0)
286	}	309	}
287		310
288	sub draw { }	311	sub draw { }
289		312
290	#############################################################################	313	#############################################################################
291		314
292	package CFClient::Widget::Container;	315	package CFClient::UI::Container;
293		316
294	our @ISA = CFClient::Widget::;	317	our @ISA = CFClient::UI::Base::;
295		318
296	sub new {	319	sub new {
297	my ($class, %arg) = @_;	320	my ($class, %arg) = @_;
298		321
299	my $children = delete $arg{children} || [];	322	my $children = delete $arg{children} || [];
…		…
303		326
304	$self	327	$self
305	}	328	}
306		329
307	sub add {	330	sub add {
308	my ($self, $chld, $expand) = @_;	331	my ($self, $chld) = @_;
309		332
310	$chld->{expand} = $expand;
311	$chld->set_parent ($self);	333	$chld->set_parent ($self);
312		334
313	$self->{children} = [	335	$self->{children} = [
314	sort { $a->{z} <=> $b->{z} }	336	sort { $a->{z} <=> $b->{z} }
315	@{$self->{children}}, $chld	337	@{$self->{children}}, $chld
316	];	338	];
317		339
318	$self->size_allocate ($self->{w}, $self->{h})	340	$self->{w} = $self->{h} = -1;
319	if $self->{w}; #TODO: check for "realised state"	341	$self->update;
320	}	342	}
321		343
322	sub remove {	344	sub remove {
323	my ($self, $widget) = @_;	345	my ($self, $widget) = @_;
324		346
325	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	347	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
326		348
327	$self->size_allocate ($self->{w}, $self->{h});	349	$self->size_allocate (0, 0, $self->{w}, $self->{h});
328	}	350	}
329		351
330	sub find_widget {	352	sub find_widget {
331	my ($self, $x, $y) = @_;	353	my ($self, $x, $y) = @_;
332		354
…		…
349	$_->draw for @{$self->{children}};	371	$_->draw for @{$self->{children}};
350	}	372	}
351		373
352	#############################################################################	374	#############################################################################
353		375
354	package CFClient::Widget::Bin;	376	package CFClient::UI::Bin;
355		377
356	our @ISA = CFClient::Widget::Container::;	378	our @ISA = CFClient::UI::Container::;
357		379
358	sub new {	380	sub new {
359	my ($class, %arg) = @_;	381	my ($class, %arg) = @_;
360		382
361	my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;	383	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
362		384
363	$class->SUPER::new (children => [$child], %arg)	385	$class->SUPER::new (children => [$child], %arg)
364	}	386	}
365		387
366	sub add {	388	sub add {
…		…
374	sub remove {	396	sub remove {
375	my ($self, $widget) = @_;	397	my ($self, $widget) = @_;
376		398
377	$self->SUPER::remove ($widget);	399	$self->SUPER::remove ($widget);
378		400
379	$self->{children} = [new CFClient::Widget::Empty]	401	$self->{children} = [new CFClient::UI::Empty]
380	unless @{$self->{children}};	402	unless @{$self->{children}};
381	}	403	}
382		404
383	sub child { $_[0]->{children}[0] }	405	sub child { $_[0]->{children}[0] }
384		406
385	sub size_request {	407	sub size_request {
386	$_[0]{children}[0]->size_request	408	$_[0]{children}[0]->size_request
387	}	409	}
388		410
389	sub size_allocate {	411	sub size_allocate {
390	my ($self, $w, $h) = @_;	412	my ($self, $x, $y, $w, $h) = @_;
391		413
392	return unless $self->{w} != $w || $self->{h} != $h;	414	$self->_size_allocate ($x, $y, $w, $h) or return;
393		415
394	$self->SUPER::size_allocate ($w, $h);
395	$self->{children}[0]->size_allocate ($w, $h);	416	$self->{children}[0]->size_allocate (0, 0, $w, $h);
396	}	417	}
397		418
398	#############################################################################	419	#############################################################################
399		420
400	package CFClient::Widget::Window;	421	package CFClient::UI::Window;
401		422
402	our @ISA = CFClient::Widget::Bin::;	423	our @ISA = CFClient::UI::Bin::;
403		424
404	use SDL::OpenGL;	425	use SDL::OpenGL;
405		426
406	sub new {	427	sub new {
407	my ($class, %arg) = @_;	428	my ($class, %arg) = @_;
…		…
425	$self->{w}, $self->{h}, sub { $self->child->draw }	446	$self->{w}, $self->{h}, sub { $self->child->draw }
426	);	447	);
427	}	448	}
428		449
429	sub size_allocate {	450	sub size_allocate {
430	my ($self, $w, $h) = @_;	451	my ($self, $x, $y, $w, $h) = @_;
431		452
432	return unless $self->{w} != $w || $self->{h} != $h;	453	$self->_size_allocate ($x, $y, $w, $h) or return;
433		454
434	$self->{w} = $w;
435	$self->{h} = $h;
436
437	$self->child->size_allocate ($w, $h);	455	$self->child->size_allocate (0, 0, $w, $h);
438		456
439	$self->render_chld;	457	$self->render_chld;
440	}	458	}
441		459
442	sub _draw {	460	sub _draw {
…		…
446		464
447	my $tex = $self->{texture}	465	my $tex = $self->{texture}
448	or return;	466	or return;
449		467
450	glEnable GL_BLEND;	468	glEnable GL_BLEND;
		469	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451	glEnable GL_TEXTURE_2D;	470	glEnable GL_TEXTURE_2D;
452	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
453		472
454	$tex->draw_quad (0, 0, $w, $h);	473	$tex->draw_quad (0, 0, $w, $h);
455		474
…		…
457	glDisable GL_TEXTURE_2D;	476	glDisable GL_TEXTURE_2D;
458	}	477	}
459		478
460	#############################################################################	479	#############################################################################
461		480
462	package CFClient::Widget::Frame;	481	package CFClient::UI::Frame;
463		482
464	our @ISA = CFClient::Widget::Bin::;	483	our @ISA = CFClient::UI::Bin::;
465		484
466	use SDL::OpenGL;	485	use SDL::OpenGL;
467		486
468	sub size_request {	487	sub size_request {
469	my ($self) = @_;	488	my ($self) = @_;
…		…
474		493
475	map { $_ + 4 } $chld->size_request;	494	map { $_ + 4 } $chld->size_request;
476	}	495	}
477		496
478	sub size_allocate {	497	sub size_allocate {
479	my ($self, $w, $h) = @_;	498	my ($self, $x, $y, $w, $h) = @_;
480		499
481	return unless $self->{w} != $w || $self->{h} != $h;	500	$self->_size_allocate ($x, $y, $w, $h) or return;
482		501
483	$self->{w} = $w;
484	$self->{h} = $h;
485
486	$self->child->size_allocate ($w - 4, $h - 4);	502	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
487	$self->child->move (2, 2);
488	}	503	}
489		504
490	sub _draw {	505	sub _draw {
491	my ($self) = @_;	506	my ($self) = @_;
492		507
…		…
505	$chld->draw;	520	$chld->draw;
506	}	521	}
507		522
508	#############################################################################	523	#############################################################################
509		524
510	package CFClient::Widget::FancyFrame;	525	package CFClient::UI::FancyFrame;
511		526
512	our @ISA = CFClient::Widget::Bin::;	527	our @ISA = CFClient::UI::Bin::;
513		528
514	use SDL::OpenGL;	529	use SDL::OpenGL;
515		530
516	my @tex =	531	my @tex =
517	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
518	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	533	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
519		534
		535	sub new {
		536	my $class = shift;
		537
		538	# TODO: user_x, user_y, overwrite moveto?
		539
		540	$class->SUPER::new (
		541	bg => [1, 1, 1, 1],
		542	border_bg => [1, 1, 1, 1],
		543	border => $::FONTSIZE * 0.8,
		544	@_
		545	)
		546	}
		547
520	sub size_request {	548	sub size_request {
521	my ($self) = @_;	549	my ($self) = @_;
522		550
		551	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		552
523	my ($w, $h) = $self->SUPER::size_request;	553	my ($w, $h) = $self->SUPER::size_request;
524		554
525	$h += $tex[1]->{h};	555	(
526	$h += $tex[4]->{h};	556	$w + $self->{border} * 2,
527	$w += $tex[2]->{w};	557	$h + $self->{border} * 2,
528	$w += $tex[3]->{w};	558	)
529
530	($w, $h)
531	}	559	}
532		560
533	sub size_allocate {	561	sub size_allocate {
534	my ($self, $w, $h) = @_;	562	my ($self, $x, $y, $w, $h) = @_;
535		563
536	return unless $self->{w} != $w || $self->{h} != $h;	564	$self->_size_allocate ($x, $y, $w, $h) or return;
537		565
538	$self->SUPER::size_allocate ($w, $h);	566	$h -= List::Util::max 0, $self->{border} * 2;
		567	$w -= List::Util::max 0, $self->{border} * 2;
539		568
540	$h -= $tex[1]->{h};	569	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
541	$h -= $tex[4]->{h};	570	}
542	$w -= $tex[2]->{w};
543	$w -= $tex[3]->{w};
544		571
545	$h = $h < 0 ? 0 : $h;	572	sub button_down {
546	$w = $w < 0 ? 0 : $w;	573	my ($self, $ev, $x, $y) = @_;
547		574
548	my $child = $self->child;	575	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
		576	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
549		577
550	$child->size_allocate ($w, $h);	578	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
551	$child->move ($tex[3]->{w}, $tex[1]->{h});	579	my ($bw, $bh) = ($self->{w}, $self->{h});
		580
		581	$self->{motion} = sub {
		582	my ($ev, $x, $y) = @_;
		583
		584	($x, $y) = ($ev->motion_x, $ev->motion_y);
		585
		586	$self->{user_w} = $bw + $x - $ox;
		587	$self->{user_h} = $bh + $y - $oy;
		588	$self->update;
		589	};
		590
		591	} elsif ($x >= 0 && $x < $self->{w}
		592	&& $y >= 0 && $y < $self->{border}) {
		593
		594	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		595	my ($bx, $by) = ($self->{x}, $self->{y});
		596
		597	$self->{motion} = sub {
		598	my ($ev, $x, $y) = @_;
		599
		600	($x, $y) = ($ev->motion_x, $ev->motion_y);
		601
		602	$self->move ($bx + $x - $ox, $by + $y - $oy);
		603	$self->update;
		604	};
		605	}
		606	}
		607
		608	sub button_up {
		609	my ($self, $ev, $x, $y) = @_;
		610
		611	delete $self->{motion};
		612	}
		613
		614	sub mouse_motion {
		615	my ($self, $ev, $x, $y) = @_;
		616
		617	$self->{motion}->($ev, $x, $y) if $self->{motion};
552	}	618	}
553		619
554	sub _draw {	620	sub _draw {
555	my ($self) = @_;	621	my ($self) = @_;
556		622
557	my ($w, $h) = ($self->{w}, $self->{h});	623	my ($w, $h ) = ($self->{w}, $self->{h});
558	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	624	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
559		625
560	glEnable GL_BLEND;	626	glEnable GL_BLEND;
		627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
561	glEnable GL_TEXTURE_2D;	628	glEnable GL_TEXTURE_2D;
562	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
564		630
565	my $top = $tex[1];	631	glColor @{ $self->{border_bg} };
566	$top->draw_quad (0, 0, $w, $top->{h});	632	$tex[1]->draw_quad (0, 0, $w, $self->{border});
567		633	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
568	my $left = $tex[3];	634	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
569	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	635	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
570
571	my $right = $tex[2];
572	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
573
574	my $bottom = $tex[4];
575	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
576		636
577	my $bg = $tex[0];	637	my $bg = $tex[0];
578	glBindTexture GL_TEXTURE_2D, $bg->{name};
579	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
580	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
581	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
582		638
		639	# TODO: repeat texture not scale
583	my $rep_x = $cw / $bg->{w};	640	my $rep_x = $cw / $bg->{w};
584	my $rep_y = $ch / $bg->{h};	641	my $rep_y = $ch / $bg->{h};
585		642
		643	glColor @{ $self->{bg} };
586	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	644	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
587		645
		646	glDisable GL_TEXTURE_2D;
588	glDisable GL_BLEND;	647	glDisable GL_BLEND;
589	glDisable GL_TEXTURE_2D;
590		648
591	$self->child->draw;	649	$self->child->draw;
592
593	}	650	}
594		651
595	#############################################################################	652	#############################################################################
596		653
597	package CFClient::Widget::Table;	654	package CFClient::UI::Table;
598		655
599	our @ISA = CFClient::Widget::;	656	our @ISA = CFClient::UI::Base::;
		657
		658	use List::Util qw(max sum);
600		659
601	use SDL::OpenGL;	660	use SDL::OpenGL;
		661
		662	sub new {
		663	my $class = shift;
		664
		665	$class->SUPER::new (
		666	col_expand => [],
		667	@_
		668	)
		669	}
602		670
603	sub add {	671	sub add {
604	my ($self, $x, $y, $chld) = @_;	672	my ($self, $x, $y, $chld) = @_;
605	my $old_chld = $self->{children}[$y][$x];
606		673
607	$self->{children}[$y][$x] = $chld;	674	$self->{children}[$y][$x] = $chld;
608	$chld->set_parent ($self);	675	$chld->set_parent ($self);
		676
		677	$self->{w} = $self->{h} = -1;
609	$self->update;	678	$self->update;
610	}	679	}
611		680
612	sub max_row_height {	681	sub get_wh {
613	my ($self, $row) = @_;	682	my ($self) = @_;
614		683
615	my $hs = 0;	684	my (@w, @h);
616	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {	685
		686	for my $y (0 .. $#{$self->{children}}) {
617	my $c = $self->{children}->[$row]->[$xi];	687	my $row = $self->{children}[$y]
618	if ($c) {	688	or next;
		689
		690	for my $x (0 .. $#$row) {
		691	my $widget = $row->[$x]
		692	or next;
619	my ($w, $h) = $c->size_request;	693	my ($w, $h) = $widget->size_request;
620	if ($hs < $h) { $hs = $h }	694
		695	$w[$x] = max $w[$x], $w;
		696	$h[$y] = max $h[$y], $h;
621	}	697	}
622	}	698	}
623	return $hs;
624	}
625		699
626	sub max_col_width {	700	(\@w, \@h)
		701	}
		702
		703	sub size_request {
627	my ($self, $col) = @_;	704	my ($self) = @_;
628		705
		706	my ($ws, $hs) = $self->get_wh;
		707
		708	(
		709	(sum @$ws),
		710	(sum @$hs),
		711	)
		712	}
		713
		714	sub size_allocate {
		715	my ($self, $x, $y, $w, $h) = @_;
		716
		717	$self->_size_allocate ($x, $y, $w, $h) or return;
		718
		719	my ($ws, $hs) = $self->get_wh;
		720
		721	my $req_w = sum @$ws;
		722	my $req_h = sum @$hs;
		723
		724	# TODO: nicer code && do row_expand
		725	my @col_expand = @{$self->{col_expand}};
		726	@col_expand = (1) x @$ws unless @col_expand;
		727	my $col_expand = (sum @col_expand) || 1;
		728
		729	# linearly scale sizes
		730	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
		731	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		732
		733	my $y;
		734
		735	for my $r (0 .. $#{$self->{children}}) {
		736	my $row = $self->{children}[$r]
		737	or next;
		738
629	my $ws = 0;	739	my $x = 0;
630	for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {	740	my $row_h = $hs->[$r];
631	my $c = ($self->{children}->[$yi] || [])->[$col];	741
632	if ($c) {	742	for my $c (0 .. $#$row) {
633	my ($w, $h) = $c->size_request;	743	my $col_w = $ws->[$c];
634	if ($ws < $w) { $ws = $w }	744
		745	if (my $widget = $row->[$c]) {
		746	$widget->size_allocate ($x, $y, $col_w, $row_h);
		747	}
		748
		749	$x += $col_w;
635	}	750	}
		751
		752	$y += $row_h;
636	}	753	}
637	return $ws;	754
638	}	755	}
		756
		757	sub find_widget {
		758	my ($self, $x, $y) = @_;
		759
		760	$x -= $self->{x};
		761	$y -= $self->{y};
		762
		763	my $res;
		764
		765	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		766	$res = $_->find_widget ($x, $y)
		767	and return $res;
		768	}
		769
		770	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		771	}
		772
		773	sub _draw {
		774	my ($self) = @_;
		775
		776	for (grep $_, @{$self->{children}}) {
		777	$_->draw for grep $_, @$_;
		778	}
		779	}
		780
		781	#############################################################################
		782
		783	package CFClient::UI::HBox;
		784
		785	# TODO: wrap into common Box base class
		786
		787	our @ISA = CFClient::UI::Container::;
639		788
640	sub size_request {	789	sub size_request {
641	my ($self) = @_;	790	my ($self) = @_;
642		791
		792	my @alloc = map [$_->size_request], @{$self->{children}};
		793
		794	(
		795	(List::Util::sum map $_->[0], @alloc),
		796	(List::Util::max map $_->[1], @alloc),
		797	)
		798	}
		799
		800	sub size_allocate {
		801	my ($self, $x, $y, $w, $h) = @_;
		802
		803	$self->_size_allocate ($x, $y, $w, $h);
		804
643	my ($hs, $ws) = (0, 0);	805	($h, $w) = ($w, $h);
644		806
645	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	807	my $children = $self->{children};
646	$hs += $self->max_row_height ($yi);
647	}
648		808
649	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	809	my @h = map +($_->size_request)[0], @$children;
650	my $wm = 0;	810
651	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	811	my $req_h = List::Util::sum @h;
652	$wm += $self->max_col_width ($xi)	812
		813	if ($req_h > $h) {
		814	# ah well, not enough space
		815	$_ *= $h / $req_h for @h;
		816	} else {
		817	my $exp = List::Util::sum map $_->{expand}, @$children;
		818	$exp ||= 1;
		819
		820	for (0 .. $#$children) {
		821	my $child = $children->[$_];
		822
		823	my $alloc_h = $h[$_];
		824	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		825	$h[$_] = $alloc_h;
653	}	826	}
654	if ($ws < $wm) { $ws = $wm }
655	}	827	}
656
657	return ($ws, $hs);
658	}
659
660	sub _draw {
661	my ($self) = @_;
662		828
663	my $y = 0;	829	my $y = 0;
664	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	830	for (0 .. $#$children) {
		831	my $child = $children->[$_];
665	my $x = 0;	832	my $h = $h[$_];
		833	$child->size_allocate ($y, 0, $h, $w);
666		834
667	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	835	$y += $h;
668
669	my $c = $self->{children}->[$yi]->[$xi];
670	if ($c) {
671	$c->move ($x, $y, 0); #TODO: Move to size_request
672	$c->draw if $c;
673	}
674
675	$x += $self->max_col_width ($xi);
676	}
677
678	$y += $self->max_row_height ($yi);
679	}	836	}
680	}	837	}
681		838
682	#############################################################################	839	#############################################################################
683		840
684	package CFClient::Widget::VBox;	841	package CFClient::UI::VBox;
685		842
		843	# TODO: wrap into common Box base class
		844
686	our @ISA = CFClient::Widget::Container::;	845	our @ISA = CFClient::UI::Container::;
687
688	use SDL::OpenGL;
689		846
690	sub size_request {	847	sub size_request {
691	my ($self) = @_;	848	my ($self) = @_;
692		849
693	my @alloc = map [$_->size_request], @{$self->{children}};	850	my @alloc = map [$_->size_request], @{$self->{children}};
…		…
697	(List::Util::sum map $_->[1], @alloc),	854	(List::Util::sum map $_->[1], @alloc),
698	)	855	)
699	}	856	}
700		857
701	sub size_allocate {	858	sub size_allocate {
702	my ($self, $w, $h) = @_;	859	my ($self, $x, $y, $w, $h) = @_;
703		860
704	return unless $self->{w} != $w || $self->{h} != $h;	861	$self->_size_allocate ($x, $y, $w, $h);
705
706	$self->{w} = $w;
707	$self->{h} = $h;
708
709	return unless $self->{h};
710		862
711	my $children = $self->{children};	863	my $children = $self->{children};
712		864
713	my @h = map +($_->size_request)[1], @$children;	865	my @h = map +($_->size_request)[1], @$children;
714		866
715	my $req_h = List::Util::sum @h;	867	my $req_h = List::Util::sum @h;
716		868
717	if ($req_h > $h) {	869	if ($req_h > $h) {
718	# ah well, not enough space	870	# ah well, not enough space
719	$_ = $h[$_] * $h / $req_h for @h;	871	$_ *= $h / $req_h for @h;
720	} else {	872	} else {
721	my @exp = grep $_->{expand}, @$children;	873	my $exp = List::Util::sum map $_->{expand}, @$children;
722	@exp = @$children unless @exp;	874	$exp ||= 1;
723		875
724	my %exp = map +($_ => 1), @exp;
725
726	for (0 .. $#$children) {	876	for (0 .. $#$children) {
727	my $child = $children->[$_];	877	my $child = $children->[$_];
728		878
729	my $alloc_h = $h[$_];	879	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
730	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
731	$h[$_] = $alloc_h;
732	}	880	}
733	}	881	}
734		882
735	my $y = 0;	883	my $y = 0;
736	for (0 .. $#$children) {	884	for (0 .. $#$children) {
737	my $child = $children->[$_];	885	my $child = $children->[$_];
738	my $h = $h[$_];	886	my $h = $h[$_];
739	$child->move (0, $y);
740	$child->size_allocate ($w, $h);	887	$child->size_allocate (0, $y, $w, $h);
741		888
742	$y += $h;	889	$y += $h;
743	}	890	}
744	}	891	}
745		892
746	#############################################################################	893	#############################################################################
747		894
748	package CFClient::Widget::Label;	895	package CFClient::UI::Label;
749		896
750	our @ISA = CFClient::Widget::;	897	our @ISA = CFClient::UI::Base::;
751		898
752	use SDL::OpenGL;	899	use SDL::OpenGL;
753		900
754	sub new {	901	sub new {
755	my ($class, %arg) = @_;	902	my ($class, %arg) = @_;
756		903
757	my $self = $class->SUPER::new (	904	my $self = $class->SUPER::new (
758	fg => [1, 1, 1],	905	fg => [1, 1, 1],
759	height => $::FONTSIZE,	906	height => $::FONTSIZE,
760	text => "",	907	text => "",
761	align => -1,	908	align => -1,
		909	padding => 2,
762	layout => new CFClient::Layout,	910	layout => new CFClient::Layout,
763	%arg	911	%arg
764	);	912	);
765		913
766	$self->set_text ($self->{text});	914	$self->set_text ($self->{text});
767		915
…		…
783		931
784	$self->{text} = $text;	932	$self->{text} = $text;
785	$self->{layout}->set_markup ($text);	933	$self->{layout}->set_markup ($text);
786		934
787	delete $self->{texture};	935	delete $self->{texture};
		936	# $self->{w} = $self->{h} = -1;
788	$self->update;	937	$self->update;
789	}	938	}
790		939
791	sub get_text {	940	sub get_text {
792	my ($self, $text) = @_;	941	my ($self, $text) = @_;
…		…
797	sub size_request {	946	sub size_request {
798	my ($self) = @_;	947	my ($self) = @_;
799		948
800	$self->{layout}->set_width;	949	$self->{layout}->set_width;
801	$self->{layout}->set_height ($self->{height});	950	$self->{layout}->set_height ($self->{height});
802	$self->{layout}->size	951	my ($w, $h) = $self->{layout}->size;
803	# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack	952
804	# (	953	(
805	# $self->{texture}{w},	954	$w + $self->{padding} * 2,
806	# $self->{texture}{h},	955	$h + $self->{padding} * 2,
807	# )	956	)
808	# } else {
809	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
810	#
811	# ($w, $h)
812	# }
813	}	957	}
814		958
815	sub size_allocate {	959	sub size_allocate {
816	my ($self, $w, $h) = @_;	960	my ($self, $x, $y, $w, $h) = @_;
817		961
818	return unless $self->{w} != $w || $self->{h} != $h;	962	$self->_size_allocate ($x, $y, $w, $h) or return;
819		963
820	$self->SUPER::size_allocate ($w, $h);
821	delete $self->{texture};	964	delete $self->{texture};
822	}	965	}
823		966
824	sub update {	967	sub update {
825	my ($self) = @_;	968	my ($self) = @_;
…		…
831	sub _draw {	974	sub _draw {
832	my ($self) = @_;	975	my ($self) = @_;
833		976
834	my $tex = $self->{texture} ||= do {	977	my $tex = $self->{texture} ||= do {
835	$self->{layout}->set_width ($self->{w});	978	$self->{layout}->set_width ($self->{w});
		979	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
836	new_from_layout CFClient::Texture $self->{layout};	980	new_from_layout CFClient::Texture $self->{layout}
837	};	981	};
838		982
839	glEnable GL_BLEND;	983	glEnable GL_BLEND;
		984	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
840	glEnable GL_TEXTURE_2D;	985	glEnable GL_TEXTURE_2D;
841	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
842	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
843		987
844	glColor @{$self->{fg}};	988	glColor @{$self->{fg}};
845		989
846	my $x =	990	my $x =
847	$self->{align} < 0 ? 0	991	$self->{align} < 0 ? $self->{padding}
848	: $self->{align} > 0 ? $self->{w} - $self->{texture}{w}	992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
849	: ($self->{w} + $self->{texture}{w}) * 0.5;	993	: ($self->{w} - $tex->{w}) * 0.5;
850		994
		995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
851	$tex->draw_quad ($x, 0);	996	$tex->draw_quad (0, 0);
852		997
		998	glDisable GL_TEXTURE_2D;
853	glDisable GL_BLEND;	999	glDisable GL_BLEND;
854	glDisable GL_TEXTURE_2D;
855	}	1000	}
856		1001
857	#############################################################################	1002	#############################################################################
858		1003
859	package CFClient::Widget::Entry;	1004	package CFClient::UI::Entry;
860		1005
861	our @ISA = CFClient::Widget::Label::;	1006	our @ISA = CFClient::UI::Label::;
862		1007
863	use SDL;	1008	use SDL;
864	use SDL::OpenGL;	1009	use SDL::OpenGL;
865		1010
866	sub new {	1011	sub new {
867	my $class = shift;	1012	my $class = shift;
868		1013
869	$class->SUPER::new (	1014	$class->SUPER::new (
870	fg => [1, 1, 1],	1015	fg => [1, 1, 1],
871	bg => [0, 0, 0, 0.4],	1016	bg => [0, 0, 0, 0.2],
872	active_bg => [1, 1, 1],	1017	active_bg => [1, 1, 1, 0.5],
873	active_fg => [0, 0, 0],	1018	active_fg => [0, 0, 0],
		1019	can_hover => 1,
		1020	can_focus => 1,
874	@_	1021	@_
875	)	1022	)
876	}	1023	}
877		1024
878	sub _set_text {	1025	sub _set_text {
…		…
880		1027
881	$self->{last_activity} = $::NOW;	1028	$self->{last_activity} = $::NOW;
882		1029
883	$self->{text} = $text;	1030	$self->{text} = $text;
884	$self->{layout}->set_width ($self->{w});	1031	$self->{layout}->set_width ($self->{w});
		1032	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
885		1033
886	$text =~ s/./*/g if $self->{hidden};	1034	$text =~ s/./*/g if $self->{hidden};
887		1035
888
889	$self->{layout}->set_markup ($self->escape_text ($text));	1036	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
890		1037
891	$text = substr $text, 0, $self->{cursor};	1038	$text = substr $text, 0, $self->{cursor};
892	utf8::encode $text;	1039	utf8::encode $text;
893		1040
894	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1041	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
…		…
901		1048
902	($w + 1, $h) # add 1 for cursor	1049	($w + 1, $h) # add 1 for cursor
903	}	1050	}
904		1051
905	sub size_allocate {	1052	sub size_allocate {
906	my ($self, $w, $h) = @_;	1053	my ($self, $x, $y, $w, $h) = @_;
907		1054
908	return unless $self->{w} != $w || $self->{h} != $h;
909
910	$self->SUPER::size_allocate ($w, $h);	1055	$self->SUPER::size_allocate ($x, $y, $w, $h);
911		1056
912	$self->_set_text ($self->{text});	1057	$self->_set_text ($self->{text});
913	}	1058	}
914		1059
915	sub set_text {	1060	sub set_text {
…		…
936	substr $text, $self->{cursor}, 1, "";	1081	substr $text, $self->{cursor}, 1, "";
937	} elsif ($sym == SDLK_LEFT) {	1082	} elsif ($sym == SDLK_LEFT) {
938	--$self->{cursor} if $self->{cursor};	1083	--$self->{cursor} if $self->{cursor};
939	} elsif ($sym == SDLK_RIGHT) {	1084	} elsif ($sym == SDLK_RIGHT) {
940	++$self->{cursor} if $self->{cursor} < length $self->{text};	1085	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1086	} elsif ($sym == SDLK_HOME) {
		1087	$self->{cursor} = 0;
		1088	} elsif ($sym == SDLK_END) {
		1089	$self->{cursor} = length $text;
941	} elsif ($uni) {	1090	} elsif ($uni) {
942	substr $text, $self->{cursor}++, 0, chr $uni;	1091	substr $text, $self->{cursor}++, 0, chr $uni;
943	}	1092	}
944		1093
945	$self->_set_text ($text);	1094	$self->_set_text ($text);
…		…
960	$self->SUPER::button_down ($ev, $x, $y);	1109	$self->SUPER::button_down ($ev, $x, $y);
961		1110
962	my $idx = $self->{layout}->xy_to_index ($x, $y);	1111	my $idx = $self->{layout}->xy_to_index ($x, $y);
963		1112
964	# byte-index to char-index	1113	# byte-index to char-index
965	my $text = $self->{layout};	1114	my $text = $self->{text};
966	utf8::encode $text;	1115	utf8::encode $text;
967	$self->{cursor} = length substr $text, 0, $idx;	1116	$self->{cursor} = length substr $text, 0, $idx;
968		1117
969	$self->_set_text ($self->{text});	1118	$self->_set_text ($self->{text});
970	$self->update;	1119	$self->update;
…		…
985	$self->{fg} = $self->{active_fg};	1134	$self->{fg} = $self->{active_fg};
986	} else {	1135	} else {
987	glColor @{$self->{bg}};	1136	glColor @{$self->{bg}};
988	}	1137	}
989		1138
		1139	glEnable GL_BLEND;
		1140	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990	glBegin GL_QUADS;	1141	glBegin GL_QUADS;
991	glVertex 0 , 0;	1142	glVertex 0 , 0;
992	glVertex 0 , $self->{h};	1143	glVertex 0 , $self->{h};
993	glVertex $self->{w}, $self->{h};	1144	glVertex $self->{w}, $self->{h};
994	glVertex $self->{w}, 0;	1145	glVertex $self->{w}, 0;
995	glEnd;	1146	glEnd;
		1147	glDisable GL_BLEND;
996		1148
997	$self->SUPER::_draw;	1149	$self->SUPER::_draw;
998		1150
999	#TODO: force update every cursor change :(	1151	#TODO: force update every cursor change :(
1000	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1152	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
…		…
1004	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1156	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1005	glEnd;	1157	glEnd;
1006	}	1158	}
1007	}	1159	}
1008		1160
1009	#############################################################################	1161	package CFClient::UI::LineEntry;
1010		1162
1011	package CFClient::Widget::Slider;	1163	our @ISA = CFClient::UI::Entry::;
1012		1164
1013	use strict;	1165	use SDL;
1014
1015	use SDL::OpenGL;	1166	use SDL::OpenGL;
1016	use SDL::OpenGL::Constants;
1017		1167
1018	our @ISA = CFClient::Widget::DrawBG::;	1168	sub key_down {
1019
1020	sub size_request {
1021	my ($self) = @_;	1169	my ($self, $ev) = @_;
1022		1170
1023	my $w = 50;	1171	my $sym = $ev->key_sym;
1024	my $h = 10;
1025		1172
1026	$self->{vertical} ? ($h, $w) : ($w, $h)	1173	if ($sym == SDLK_RETURN) {
		1174	$self->emit (activate => $self->get_text);
		1175	$self->update;
		1176
		1177	} else {
		1178	$self->SUPER::key_down ($ev);
		1179	}
		1180
1027	}	1181	}
		1182
		1183	#############################################################################
		1184
		1185	package CFClient::UI::Button;
		1186
		1187	our @ISA = CFClient::UI::Label::;
		1188
		1189	use SDL;
		1190	use SDL::OpenGL;
		1191
		1192	my @tex =
		1193	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1194	qw(b1_button_active.png);
1028		1195
1029	sub new {	1196	sub new {
1030	my $class = shift;	1197	my $class = shift;
1031		1198
		1199	$class->SUPER::new (
		1200	padding => 4,
		1201	fg => [1, 1, 1],
		1202	bg => [1, 1, 1, 0.2],
		1203	active_fg => [1, 1, 0],
		1204	can_hover => 1,
		1205	@_
		1206	)
		1207	}
		1208
		1209	sub button_up {
		1210	my ($self, $ev, $x, $y) = @_;
		1211
		1212	if ($x >= 0 && $x < $self->{w}
		1213	&& $y >= 0 && $y < $self->{h}) {
		1214	$self->emit ("activate");
		1215	}
		1216	}
		1217
		1218	sub _draw {
		1219	my ($self) = @_;
		1220
		1221	local $self->{fg} = $self->{fg};
		1222	my $tex = $tex[0];
		1223
		1224	glEnable GL_BLEND;
		1225	glEnable GL_TEXTURE_2D;
		1226	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1227
		1228	if ($GRAB == $self) {
		1229	$self->{fg} = $self->{active_fg};
		1230	}
		1231
		1232	glBindTexture GL_TEXTURE_2D, $tex->{name};
		1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1234
		1235	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		1236
		1237	glDisable GL_TEXTURE_2D;
		1238	glDisable GL_BLEND;
		1239
		1240	$self->SUPER::_draw;
		1241	}
		1242
		1243	#############################################################################
		1244
		1245	package CFClient::UI::CheckBox;
		1246
		1247	our @ISA = CFClient::UI::DrawBG::;
		1248
		1249	use SDL;
		1250	use SDL::OpenGL;
		1251
		1252	sub new {
		1253	my $class = shift;
		1254
		1255	$class->SUPER::new (
		1256	padding => 2,
		1257	fg => [1, 1, 1],
		1258	active_fg => [1, 1, 0],
		1259	state => 0,
		1260	can_hover => 1,
		1261	@_
		1262	)
		1263	}
		1264
		1265	sub size_request {
		1266	my ($self) = @_;
		1267
		1268	($self->{padding} * 2 + 6) x 2
		1269	}
		1270
		1271	sub size_allocate {
		1272	my ($self, $x, $y, $w, $h) = @_;
		1273
		1274	$self->_size_allocate ($x, $y, $w, $h);
		1275	}
		1276
		1277	sub button_down {
		1278	my ($self, $ev, $x, $y) = @_;
		1279
		1280	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1281	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1282	$self->{state} = !$self->{state};
		1283	$self->emit (changed => $self->{state});
		1284	}
		1285	}
		1286
		1287	sub _draw {
		1288	my ($self) = @_;
		1289
		1290	$self->SUPER::_draw;
		1291
		1292	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1293
		1294	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1295
		1296	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1297
		1298	glBegin GL_LINE_LOOP;
		1299	glVertex 0 , 0;
		1300	glVertex 0 , $s;
		1301	glVertex $s, $s;
		1302	glVertex $s, 0;
		1303	glEnd;
		1304
		1305	if ($self->{state}) {
		1306	glBegin GL_LINES;
		1307	glVertex 0 , 0;
		1308	glVertex $s, $s;
		1309	glVertex $s, 0;
		1310	glVertex 0 , $s;
		1311	glEnd;
		1312	}
		1313	}
		1314
		1315	#############################################################################
		1316
		1317	package CFClient::UI::Slider;
		1318
		1319	use strict;
		1320
		1321	use SDL::OpenGL;
		1322
		1323	our @ISA = CFClient::UI::DrawBG::;
		1324
		1325	my @tex =
		1326	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1327	qw(s1_slider.png s1_slider_bg.png);
		1328
		1329	sub new {
		1330	my $class = shift;
		1331
1032	# range [value, low, high, page]	1332	# range [value, low, high, page]
1033		1333
		1334	# TODO: 0-width page
		1335	# TODO: req_w/h are wrong with vertical
		1336	# TODO: calculations are off
1034	$class->SUPER::new (	1337	my $self = $class->SUPER::new (
1035	fg => [1, 1, 1],	1338	fg => [1, 1, 1],
1036	active_fg => [0, 0, 0],	1339	active_fg => [0, 0, 0],
1037	range => [0, 0, 100, 10],	1340	range => [0, 0, 100, 10],
		1341	req_w => 40,
		1342	req_h => 13,
1038	vertical => 1,	1343	vertical => 0,
		1344	can_hover => 1,
1039	@_	1345	@_
1040	)	1346	);
		1347
		1348	$self
		1349	}
		1350
		1351	sub size_request {
		1352	my ($self) = @_;
		1353
		1354	my $w = $self->{req_w};
		1355	my $h = $self->{req_h};
		1356
		1357	$self->{vertical} ? ($h, $w) : ($w, $h)
1041	}	1358	}
1042		1359
1043	sub button_down {	1360	sub button_down {
1044	my ($self, $ev, $x, $y) = @_;	1361	my ($self, $ev, $x, $y) = @_;
1045		1362
…		…
1084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1401	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1402	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1086		1403
1087	my ($value, $lo, $hi, $page) = @{$self->{range}};	1404	my ($value, $lo, $hi, $page) = @{$self->{range}};
1088		1405
		1406	# the inner_* stuff is for generating a padding for the slider handle,
		1407	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1408	# correct propably, but it does the job for now
		1409	my $inner_pad = 5; # 5% of width for slider bg texture border
		1410	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
		1411	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1412
1089	$page = int $page * $w / ($hi - $lo);	1413	$page = int $page * $inner_w / ($hi - $lo);
1090	$value = int +($value - $lo) * $w / ($hi - $lo);	1414	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1091		1415
1092	$w -= $page;	1416	$w -= $page;
1093	$page &= ~1;	1417	$page &= ~1;
1094	glTranslate $page * 0.5, 0, 0;	1418	glTranslate $page * 0.5, 0, 0;
		1419	$page ||= 2;
1095		1420
1096	glColor @$fg;
1097	glBegin GL_LINES;
1098	glVertex 0, 0; glVertex 0, $h;
1099	glVertex $w - 1, 0; glVertex $w - 1, $h;
1100	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1101	glEnd;
1102
1103	my $knob_a = $value - $page * 0.5;	1421	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1104	my $knob_b = $value + $page * 0.5;	1422	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1105		1423
1106	glBegin GL_QUADS;	1424	glEnable GL_BLEND;
1107	glColor @$fg;	1425	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1108	glVertex $knob_a, 0;	1426	glEnable GL_TEXTURE_2D;
1109	glVertex $knob_a, $h;	1427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1110	glVertex $knob_b, $h;
1111	glVertex $knob_b, 0;
1112		1428
1113	if ($knob_a < $knob_b - 2) {	1429	# draw background
1114	glColor @$bg;	1430	$tex[1]->draw_quad (0, 0, $w, $h);
1115	glVertex $knob_a + 1, 1;
1116	glVertex $knob_a + 1, $h - 1;
1117	glVertex $knob_b - 1, $h - 1;
1118	glVertex $knob_b - 1, 1;
1119	}
1120	glEnd;
1121	}
1122		1431
1123	#############################################################################	1432	# draw handle
		1433	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1124		1434
		1435	glDisable GL_BLEND;
		1436	glDisable GL_TEXTURE_2D;
		1437	}
		1438
		1439	#############################################################################
		1440
		1441	package CFClient::UI::TextView;
		1442
		1443	our @ISA = CFClient::UI::HBox::;
		1444
		1445	use SDL::OpenGL;
		1446
		1447	sub new {
		1448	my $class = shift;
		1449
		1450	my $self = $class->SUPER::new (
		1451	par => [],
		1452	@_,
		1453	children => [
		1454	(new CFClient::UI::Empty expand => 1),
		1455	(new CFClient::UI::Slider vertical => 1),
		1456	],
		1457	);
		1458
		1459	$self
		1460	}
		1461
		1462	sub add_paragraph {
		1463	my ($self, $color, $text) = @_;
		1464
		1465	push @{$self->{par}}, [$color, $text];
		1466	my $count = scalar @{$self->{par}};
		1467	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];
		1468	$self->{children}[1]->update;
		1469	}
		1470
		1471	sub _draw {
		1472	my ($self) = @_;
		1473
		1474	my $par = $self->{par};
		1475
		1476	my $bottom = (scalar @$par) - 1;
		1477
		1478	my $w = $self->{children}[0]{w};
		1479	my $y = $self->{h};
		1480
		1481	glEnable GL_BLEND;
		1482	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1483	glEnable GL_TEXTURE_2D;
		1484	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1485
		1486	# TODO: everything!
		1487	while ($y > 0 && $bottom >= 0) {
		1488	my $par = $par->[$bottom--];
		1489
		1490	my $layout = new CFClient::Layout;
		1491
		1492	$layout->set_height ($::FONTSIZE);
		1493	$layout->set_width ($w);
		1494	$layout->set_text ($par->[1]);
		1495	my $tex = new_from_layout CFClient::Texture $layout;
		1496	$y -= $tex->{h};
		1497
		1498	glColor @{ $par->[0] };
		1499	$tex->draw_quad (0, $y);
		1500	}
		1501
		1502	glDisable GL_TEXTURE_2D;
		1503	glDisable GL_BLEND;
		1504	}
		1505
		1506	#############################################################################
		1507
1125	package CFClient::Widget::MapWidget;	1508	package CFClient::UI::MapWidget;
1126		1509
1127	use strict;	1510	use strict;
1128		1511
1129	use List::Util qw(min max);	1512	use List::Util qw(min max);
1130		1513
1131	use SDL;	1514	use SDL;
1132	use SDL::OpenGL;	1515	use SDL::OpenGL;
1133	use SDL::OpenGL::Constants;
1134		1516
1135	our @ISA = CFClient::Widget::;	1517	our @ISA = CFClient::UI::Base::;
1136		1518
1137	sub new {	1519	sub new {
1138	my $class = shift;	1520	my $class = shift;
1139		1521
1140	$class->SUPER::new (	1522	$class->SUPER::new (
1141	z => -1,	1523	z => -1,
		1524	can_focus => 1,
1142	list => (glGenLists 1),	1525	list => (glGenLists 1),
1143	@_	1526	@_
1144	)	1527	)
1145	}	1528	}
1146		1529
1147	sub key_down {	1530	sub key_down {
…		…
1151	sub key_up {	1534	sub key_up {
1152	}	1535	}
1153		1536
1154	sub size_request {	1537	sub size_request {
1155	(	1538	(
1156	1 + int $::WIDTH / 32,	1539	1 + 32 * int $::WIDTH / 32,
1157	1 + int $::HEIGHT / 32,	1540	1 + 32 * int $::HEIGHT / 32,
1158	)	1541	)
1159	}	1542	}
1160		1543
1161	sub update {	1544	sub update {
1162	my ($self) = @_;	1545	my ($self) = @_;
1163		1546
1164	$self->{need_update} = 1;	1547	$self->{need_update} = 1;
		1548	$self->SUPER::update;
1165	}	1549	}
1166		1550
1167	sub _draw {	1551	sub draw {
1168	my ($self) = @_;	1552	my ($self) = @_;
1169		1553
		1554	$self->{need_update}++;#d#
1170	if (delete $self->{need_update}) {	1555	if (delete $self->{need_update}) {
1171	glNewList $self->{list}, GL_COMPILE;	1556	glNewList $self->{list}, GL_COMPILE;
1172		1557
1173	my $mx = $::CONN->{mapx};
1174	my $my = $::CONN->{mapy};
1175
1176	my $map = $::CONN->{map};
1177
1178	my ($xofs, $yofs);
1179
1180	my $sw = 1 + int $::WIDTH / 32;	1558	my $sw = int $::WIDTH / 32;
1181	my $sh = 1 + int $::HEIGHT / 32;	1559	my $sh = int $::HEIGHT / 32;
1182		1560
1183	if ($::CONN->{mapw} > $sw) {	1561	if ($::MAP) {
1184	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1562	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1185	} else {
1186	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1187	}
1188		1563
1189	if ($::CONN->{maph} > $sh) {	1564	if ($::CFG->{fow_enable}) {
1190	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1565	if ($::CFG->{fow_smooth}) { # smooth fog of war
1191	} else {	1566	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1192	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1567	glConvolutionFilter2D
1193	}	1568	GL_CONVOLUTION_2D,
1194		1569	GL_ALPHA,
1195	glEnable GL_TEXTURE_2D;	1570	3, 3,
1196	glEnable GL_BLEND;	1571	GL_ALPHA, GL_FLOAT,
1197	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1572	pack "f*",
1198		1573	0.1, 0.1, 0.1,
1199	my $sw4 = ($sw + 3) & ~3;	1574	0.1, 0.2, 0.1,
1200	my $darkness = "\x00" x ($sw4 * $sh);	1575	0.1, 0.1, 0.1,
1201
1202	for my $x (0 .. $sw - 1) {
1203	my $row = $map->[$x + $xofs];
1204	for my $y (0 .. $sh - 1) {
1205
1206	my $cell = $row->[$y + $yofs]
1207	or next;	1576	;
1208		1577	glEnable GL_CONVOLUTION_2D;
1209	my $dark = $cell->[0];
1210	if ($dark < 0) {
1211	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1212	} else {
1213	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1214	}	1578	}
1215		1579
1216	for my $num (grep $_, @$cell[1,2,3]) {	1580	my $tex = new CFClient::Texture
1217	my $tex = $::CONN->{face}[$num]{texture} || next;	1581	w => $w,
1218		1582	h => $h,
1219	my ($w, $h) = @$tex{qw(w h)};	1583	data => $data,
		1584	internalformat => GL_ALPHA,
		1585	format => GL_ALPHA;
1220		1586
1221	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1587	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1222	}	1588
		1589	glEnable GL_BLEND;
		1590	glEnable GL_TEXTURE_2D;
		1591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1592
		1593	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1594	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1595
		1596	glDisable GL_TEXTURE_2D;
		1597	glDisable GL_BLEND;
1223	}	1598	}
1224	}	1599	}
1225		1600
1226	# if (1) { # higher quality darkness
1227	# $lighting =~ s/(.)/$1$1$1/gs;
1228	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1229	#
1230	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1231	#
1232	# $lighting = $pb->get_pixels;
1233	# $lighting =~ s/(.)../$1/gs;
1234	# }
1235
1236	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1237	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1238
1239	$darkness = new CFClient::Texture
1240	width => $sw4,
1241	height => $sh,
1242	data => $darkness,
1243	internalformat => GL_ALPHA,
1244	format => GL_ALPHA;
1245
1246	glColor 0.45, 0.45, 0.45, 1;
1247	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1248
1249	glDisable GL_TEXTURE_2D;
1250	glDisable GL_BLEND;
1251
1252	glEndList;	1601	glEndList;
1253	}	1602	}
1254		1603
1255	glCallList $self->{list};	1604	glCallList $self->{list};
		1605
		1606	if ($FOCUS != $self) {
		1607	glColor 64/255, 64/255, 64/255;
		1608	glLogicOp GL_AND;
		1609	glEnable GL_COLOR_LOGIC_OP;
		1610	glBegin GL_QUADS;
		1611	glVertex 0, 0;
		1612	glVertex 0, $::HEIGHT;
		1613	glVertex $::WIDTH, $::HEIGHT;
		1614	glVertex $::WIDTH, 0;
		1615	glEnd;
		1616	glDisable GL_COLOR_LOGIC_OP;
		1617	}
1256	}	1618	}
1257		1619
1258	my %DIR = (	1620	my %DIR = (
1259	SDLK_KP8, [1, "north"],	1621	SDLK_KP8, [1, "north"],
1260	SDLK_KP9, [2, "northeast"],	1622	SDLK_KP9, [2, "northeast"],
…		…
1276		1638
1277	my $mod = $ev->key_mod;	1639	my $mod = $ev->key_mod;
1278	my $sym = $ev->key_sym;	1640	my $sym = $ev->key_sym;
1279		1641
1280	if ($sym == SDLK_KP5) {	1642	if ($sym == SDLK_KP5) {
1281	$::CONN->send ("command stay fire");	1643	$::CONN->user_send ("command stay fire");
		1644	} elsif ($sym == SDLK_a) {
		1645	$::CONN->user_send ("command apply");
1282	} elsif (exists $DIR{$sym}) {	1646	} elsif (exists $DIR{$sym}) {
1283	if ($mod & KMOD_SHIFT) {	1647	if ($mod & KMOD_SHIFT) {
1284	$self->{shft}++;	1648	$self->{shft}++;
1285	$::CONN->send ("command fire $DIR{$sym}[0]");	1649	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1286	} elsif ($mod & KMOD_CTRL) {	1650	} elsif ($mod & KMOD_CTRL) {
1287	$self->{ctrl}++;	1651	$self->{ctrl}++;
1288	$::CONN->send ("command run $DIR{$sym}[0]");	1652	$::CONN->user_send ("command run $DIR{$sym}[0]");
1289	} else {	1653	} else {
1290	$::CONN->send ("command $DIR{$sym}[1]");	1654	$::CONN->user_send ("command $DIR{$sym}[1]");
1291	}	1655	}
1292	}	1656	}
1293	}	1657	}
1294		1658
1295	sub key_up {	1659	sub key_up {
…		…
1297		1661
1298	my $mod = $ev->key_mod;	1662	my $mod = $ev->key_mod;
1299	my $sym = $ev->key_sym;	1663	my $sym = $ev->key_sym;
1300		1664
1301	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1665	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1302	$::CONN->send ("command fire_stop");	1666	$::CONN->user_send ("command fire_stop");
1303	}	1667	}
1304	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1668	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1305	$::CONN->send ("command run_stop");	1669	$::CONN->user_send ("command run_stop");
1306	}	1670	}
1307	}	1671	}
1308		1672
1309	#############################################################################	1673	#############################################################################
1310		1674
1311	package CFClient::Widget::Animator;	1675	package CFClient::UI::Animator;
1312		1676
1313	use SDL::OpenGL;	1677	use SDL::OpenGL;
1314		1678
1315	our @ISA = CFClient::Widget::Bin::;	1679	our @ISA = CFClient::UI::Bin::;
1316		1680
1317	sub moveto {	1681	sub moveto {
1318	my ($self, $x, $y) = @_;	1682	my ($self, $x, $y) = @_;
1319		1683
1320	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1684	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
1348	glPopMatrix;	1712	glPopMatrix;
1349	}	1713	}
1350		1714
1351	#############################################################################	1715	#############################################################################
1352		1716
		1717	package CFClient::UI::Flopper;
		1718
		1719	our @ISA = CFClient::UI::Button::;
		1720
		1721	sub new {
		1722	my $class = shift;
		1723
		1724	my $self = $class->SUPER::new (
		1725	state => 0,
		1726	connect_activate => \&toggle_flopper,
		1727	@_
		1728	);
		1729
		1730	if ($self->{state}) {
		1731	$self->{state} = 0;
		1732	$self->toggle_flopper;
		1733	}
		1734
		1735	$self
		1736	}
		1737
		1738	sub toggle_flopper {
		1739	my ($self) = @_;
		1740
		1741	# TODO: use animation
		1742	if ($self->{state} = !$self->{state}) {
		1743	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1744	$self->{other}->move (
		1745	($::WIDTH - $self->{other}{w}) * 0.5,
		1746	($::HEIGHT - $self->{other}{h}) * 0.5,
		1747	);
		1748	} else {
		1749	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1750	}
		1751	}
		1752
		1753	#############################################################################
		1754
1353	package CFClient::Widget::Toplevel;	1755	package CFClient::UI::Toplevel;
1354		1756
1355	our @ISA = CFClient::Widget::Container::;	1757	our @ISA = CFClient::UI::Container::;
1356		1758
1357	sub size_request {	1759	sub size_request {
1358	($::WIDTH, $::HEIGHT)	1760	($::WIDTH, $::HEIGHT)
1359	}	1761	}
1360		1762
1361	sub size_allocate {	1763	sub size_allocate {
1362	my ($self, $w, $h) = @_;	1764	my ($self, $x, $y, $w, $h) = @_;
1363		1765
1364	$self->SUPER::size_allocate ($w, $h);	1766	$self->_size_allocate ($x, $y, $w, $h);
1365		1767
1366	$_->size_allocate ($_->size_request)	1768	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1367	for @{$self->{children}};	1769	for @{$self->{children}};
1368	}	1770	}
1369		1771
1370	sub translate {	1772	sub translate {
1371	my ($self, $x, $y) = @_;	1773	my ($self, $x, $y) = @_;
…		…
1374	}	1776	}
1375		1777
1376	sub update {	1778	sub update {
1377	my ($self) = @_;	1779	my ($self) = @_;
1378		1780
1379	$self->size_allocate ($self->size_request);	1781	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1380	::refresh ();	1782	::refresh ();
1381	}	1783	}
1382		1784
1383	sub add {	1785	sub add {
1384	my ($self, $widget) = @_;	1786	my ($self, $widget) = @_;
1385		1787
1386	$self->SUPER::add ($widget);	1788	$self->SUPER::add ($widget);
1387		1789
1388	$widget->size_allocate ($widget->size_request);	1790	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1389	}	1791	}
1390		1792
1391	sub draw {	1793	sub draw {
1392	my ($self) = @_;	1794	my ($self) = @_;
1393		1795
1394	$self->_draw;	1796	$self->_draw;
1395	}	1797	}
1396		1798
1397	#############################################################################	1799	#############################################################################
1398		1800
1399	package CFClient::Widget;	1801	package CFClient::UI;
1400		1802
1401	$TOPLEVEL = new CFClient::Widget::Toplevel;	1803	$TOPLEVEL = new CFClient::UI::Toplevel;
1402		1804
1403	1	1805	1
1404		1806

Diff Legend

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