[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.69 by root, Tue Apr 11 17:32:14 2006 UTC vs.
Revision 1.80 by root, Wed Apr 12 00:36:13 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;
		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);
107	}	136	}
108		137
109	# translate global koordinates to local coordinate system	138	# translate global koordinates to local coordinate system
110	sub translate {	139	sub translate {
111	my ($self, $x, $y) = @_;	140	my ($self, $x, $y) = @_;
…		…
155	return unless $self->{h} && $self->{w};	184	return unless $self->{h} && $self->{w};
156		185
157	glPushMatrix;	186	glPushMatrix;
158	glTranslate $self->{x}, $self->{y}, 0;	187	glTranslate $self->{x}, $self->{y}, 0;
159	$self->_draw;	188	$self->_draw;
		189	glPopMatrix;
		190
160	if ($self == $HOVER) {	191	if ($self == $HOVER) {
161	glColor 1, 1, 1, 0.4;	192	my ($x, $y) = @$self{qw(x y)};
		193
		194	glColor 0, 0, 1, 0.2;
162	glEnable GL_BLEND;	195	glEnable GL_BLEND;
		196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
163	glBegin GL_QUADS;	197	glBegin GL_QUADS;
164	glVertex 0 , 0;	198	glVertex $x , $y;
165	glVertex $self->{w}, 0;	199	glVertex $x + $self->{w}, $y;
166	glVertex $self->{w}, $self->{h};	200	glVertex $x + $self->{w}, $y + $self->{h};
167	glVertex 0 , $self->{h};	201	glVertex $x , $y + $self->{h};
168	glEnd;	202	glEnd;
169	glDisable GL_BLEND;	203	glDisable GL_BLEND;
170	}	204	}
171	glPopMatrix;
172	}	205	}
173		206
174	sub _draw {	207	sub _draw {
175	my ($self) = @_;	208	my ($self) = @_;
176		209
177	warn "no draw defined for $self\n";	210	warn "no draw defined for $self\n";
178	}
179
180	sub bbox {
181	my ($self) = @_;
182	my ($w, $h) = $self->size_request;
183	(
184	$self->{x},
185	$self->{y},
186	$self->{x} = $w,
187	$self->{y} = $h
188	)
189	}	211	}
190		212
191	sub find_widget {	213	sub find_widget {
192	my ($self, $x, $y) = @_;	214	my ($self, $x, $y) = @_;
193		215
…		…
196	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	218	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
197		219
198	()	220	()
199	}	221	}
200		222
201	sub del_parent { $_[0]->{parent} = undef }
202
203	sub set_parent {	223	sub set_parent {
204	my ($self, $par) = @_;	224	my ($self, $par) = @_;
205		225
206	$self->{parent} = $par;	226	$self->{parent} = $par;
207	Scalar::Util::weaken $self->{parent};	227	Scalar::Util::weaken $self->{parent};
…		…
216		236
217	$self->{parent}->update	237	$self->{parent}->update
218	if $self->{parent};	238	if $self->{parent};
219	}	239	}
220		240
		241	sub connect {
		242	my ($self, $signal, $cb) = @_;
		243
		244	push @{ $self->{cb}{$signal} }, $cb;
		245	}
		246
		247	sub emit {
		248	my ($self, $signal, @args) = @_;
		249
		250	$_->($self, @args)
		251	for @{$self->{cb}{$signal} \|\| []};
		252	}
		253
221	sub DESTROY {	254	sub DESTROY {
222	my ($self) = @_;	255	my ($self) = @_;
223		256
224	#$self->deactivate;	257	#$self->deactivate;
225	}	258	}
226		259
227	#############################################################################	260	#############################################################################
228		261
229	package CFClient::Widget::DrawBG;	262	package CFClient::UI::DrawBG;
230		263
231	our @ISA = CFClient::Widget::;	264	our @ISA = CFClient::UI::Base::;
232		265
233	use strict;	266	use strict;
234	use SDL::OpenGL;	267	use SDL::OpenGL;
235		268
236	sub new {	269	sub new {
237	my $class = shift;	270	my $class = shift;
238		271
239	# range [value, low, high, page]	272	# range [value, low, high, page]
240		273
241	$class->SUPER::new (	274	$class->SUPER::new (
242	bg => [0, 0, 0, 0.4],	275	bg => [0, 0, 0, 0.2],
243	active_bg => [1, 1, 1],	276	active_bg => [1, 1, 1, 0.5],
244	@_	277	@_
245	)	278	)
246	}	279	}
247		280
248	sub _draw {	281	sub _draw {
249	my ($self) = @_;	282	my ($self) = @_;
250		283
251	my ($w, $h) = @$self{qw(w h)};	284	my ($w, $h) = @$self{qw(w h)};
252		285
		286	glEnable GL_BLEND;
		287	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	288	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		289
254	glBegin GL_QUADS;	290	glBegin GL_QUADS;
255	glVertex 0 , 0;	291	glVertex 0 , 0;
256	glVertex 0 , $h;	292	glVertex 0 , $h;
257	glVertex $w, $h;	293	glVertex $w, $h;
258	glVertex $w, 0;	294	glVertex $w, 0;
259	glEnd;	295	glEnd;
260	}
261		296
262	#############################################################################	297	glDisable GL_BLEND;
		298	}
263		299
		300	#############################################################################
		301
264	package CFClient::Widget::Empty;	302	package CFClient::UI::Empty;
265		303
266	our @ISA = CFClient::Widget::;	304	our @ISA = CFClient::UI::Base::;
267		305
268	sub size_request {	306	sub size_request {
269	(0, 0)	307	(0, 0)
270	}	308	}
271		309
272	sub draw { }	310	sub draw { }
273		311
274	#############################################################################	312	#############################################################################
275		313
276	package CFClient::Widget::Container;	314	package CFClient::UI::Container;
277		315
278	our @ISA = CFClient::Widget::;	316	our @ISA = CFClient::UI::Base::;
279		317
280	sub new {	318	sub new {
281	my ($class, %arg) = @_;	319	my ($class, %arg) = @_;
282		320
283	my $children = delete $arg{children} \|\| [];	321	my $children = delete $arg{children} \|\| [];
…		…
287		325
288	$self	326	$self
289	}	327	}
290		328
291	sub add {	329	sub add {
292	my ($self, $chld, $expand) = @_;	330	my ($self, $chld) = @_;
293		331
294	$chld->{expand} = $expand;
295	$chld->set_parent ($self);	332	$chld->set_parent ($self);
296		333
297	$self->{children} = [	334	$self->{children} = [
298	sort { $a->{z} <=> $b->{z} }	335	sort { $a->{z} <=> $b->{z} }
299	@{$self->{children}}, $chld	336	@{$self->{children}}, $chld
300	];	337	];
301		338
302	$self->size_allocate ($self->{w}, $self->{h})	339	$self->{w} = $self->{h} = -1;
303	if $self->{w}; #TODO: check for "realised state"	340	$self->update;
304	}	341	}
305		342
306	sub remove {	343	sub remove {
307	my ($self, $widget) = @_;	344	my ($self, $widget) = @_;
308		345
309	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	346	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
310		347
311	$self->size_allocate ($self->{w}, $self->{h});	348	$self->size_allocate (0, 0, $self->{w}, $self->{h});
312	}	349	}
313		350
314	sub find_widget {	351	sub find_widget {
315	my ($self, $x, $y) = @_;	352	my ($self, $x, $y) = @_;
316		353
…		…
333	$_->draw for @{$self->{children}};	370	$_->draw for @{$self->{children}};
334	}	371	}
335		372
336	#############################################################################	373	#############################################################################
337		374
338	package CFClient::Widget::Bin;	375	package CFClient::UI::Bin;
339		376
340	our @ISA = CFClient::Widget::Container::;	377	our @ISA = CFClient::UI::Container::;
341		378
342	sub new {	379	sub new {
343	my ($class, %arg) = @_;	380	my ($class, %arg) = @_;
344		381
345	my $child = (delete $arg{child}) \|\| new CFClient::Widget::Empty::;	382	my $child = (delete $arg{child}) \|\| new CFClient::UI::Empty::;
346		383
347	$class->SUPER::new (children => [$child], %arg)	384	$class->SUPER::new (children => [$child], %arg)
348	}	385	}
349		386
350	sub add {	387	sub add {
…		…
358	sub remove {	395	sub remove {
359	my ($self, $widget) = @_;	396	my ($self, $widget) = @_;
360		397
361	$self->SUPER::remove ($widget);	398	$self->SUPER::remove ($widget);
362		399
363	$self->{children} = [new CFClient::Widget::Empty]	400	$self->{children} = [new CFClient::UI::Empty]
364	unless @{$self->{children}};	401	unless @{$self->{children}};
365	}	402	}
366		403
367	sub child { $_[0]->{children}[0] }	404	sub child { $_[0]->{children}[0] }
368		405
369	sub size_request {	406	sub size_request {
370	$_[0]{children}[0]->size_request	407	$_[0]{children}[0]->size_request
371	}	408	}
372		409
373	sub size_allocate {	410	sub size_allocate {
374	my ($self, $w, $h) = @_;	411	my ($self, $x, $y, $w, $h) = @_;
375		412
376	return unless $self->{w} != $w \|\| $self->{h} != $h;	413	$self->_size_allocate ($x, $y, $w, $h) or return;
377		414
378	$self->SUPER::size_allocate ($w, $h);
379	$self->{children}[0]->size_allocate ($w, $h);	415	$self->{children}[0]->size_allocate (0, 0, $w, $h);
380	}	416	}
381		417
382	#############################################################################	418	#############################################################################
383		419
384	package CFClient::Widget::Window;	420	package CFClient::UI::Window;
385		421
386	our @ISA = CFClient::Widget::Bin::;	422	our @ISA = CFClient::UI::Bin::;
387		423
388	use SDL::OpenGL;	424	use SDL::OpenGL;
389		425
390	sub new {	426	sub new {
391	my ($class, %arg) = @_;	427	my ($class, %arg) = @_;
…		…
409	$self->{w}, $self->{h}, sub { $self->child->draw }	445	$self->{w}, $self->{h}, sub { $self->child->draw }
410	);	446	);
411	}	447	}
412		448
413	sub size_allocate {	449	sub size_allocate {
414	my ($self, $w, $h) = @_;	450	my ($self, $x, $y, $w, $h) = @_;
415		451
416	return unless $self->{w} != $w \|\| $self->{h} != $h;	452	$self->_size_allocate ($x, $y, $w, $h) or return;
417		453
418	$self->{w} = $w;
419	$self->{h} = $h;
420
421	$self->child->size_allocate ($w, $h);	454	$self->child->size_allocate (0, 0, $w, $h);
422		455
423	$self->render_chld;	456	$self->render_chld;
424	}	457	}
425		458
426	sub _draw {	459	sub _draw {
…		…
430		463
431	my $tex = $self->{texture}	464	my $tex = $self->{texture}
432	or return;	465	or return;
433		466
434	glEnable GL_BLEND;	467	glEnable GL_BLEND;
		468	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
435	glEnable GL_TEXTURE_2D;	469	glEnable GL_TEXTURE_2D;
436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
437		471
438	$tex->draw_quad (0, 0, $w, $h);	472	$tex->draw_quad (0, 0, $w, $h);
439		473
…		…
441	glDisable GL_TEXTURE_2D;	475	glDisable GL_TEXTURE_2D;
442	}	476	}
443		477
444	#############################################################################	478	#############################################################################
445		479
446	package CFClient::Widget::Frame;	480	package CFClient::UI::Frame;
447		481
448	our @ISA = CFClient::Widget::Bin::;	482	our @ISA = CFClient::UI::Bin::;
449		483
450	use SDL::OpenGL;	484	use SDL::OpenGL;
451		485
452	sub size_request {	486	sub size_request {
453	my ($self) = @_;	487	my ($self) = @_;
…		…
458		492
459	map { $_ + 4 } $chld->size_request;	493	map { $_ + 4 } $chld->size_request;
460	}	494	}
461		495
462	sub size_allocate {	496	sub size_allocate {
463	my ($self, $w, $h) = @_;	497	my ($self, $x, $y, $w, $h) = @_;
464		498
465	return unless $self->{w} != $w \|\| $self->{h} != $h;	499	$self->_size_allocate ($x, $y, $w, $h) or return;
466		500
467	$self->{w} = $w;
468	$self->{h} = $h;
469
470	$self->child->size_allocate ($w - 4, $h - 4);	501	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
471	$self->child->move (2, 2);
472	}	502	}
473		503
474	sub _draw {	504	sub _draw {
475	my ($self) = @_;	505	my ($self) = @_;
476		506
…		…
489	$chld->draw;	519	$chld->draw;
490	}	520	}
491		521
492	#############################################################################	522	#############################################################################
493		523
494	package CFClient::Widget::FancyFrame;	524	package CFClient::UI::FancyFrame;
495		525
496	our @ISA = CFClient::Widget::Bin::;	526	our @ISA = CFClient::UI::Bin::;
497		527
498	use SDL::OpenGL;	528	use SDL::OpenGL;
499		529
500	my @tex =	530	my @tex =
501	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
502	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	532	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
503		533
504	sub size_request {	534	sub size_request {
505	my ($self) = @_;	535	my ($self) = @_;
506		536
		537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		538
507	my ($w, $h) = $self->SUPER::size_request;	539	my ($w, $h) = $self->SUPER::size_request;
508		540
509	$h += $tex[1]->{height};	541	$h += $tex[1]->{h};
510	$h += $tex[4]->{height};	542	$h += $tex[4]->{h};
511	$w += $tex[2]->{width};	543	$w += $tex[2]->{w};
512	$w += $tex[3]->{width};	544	$w += $tex[3]->{w};
513		545
514	($w, $h)	546	($w, $h)
515	}	547	}
516		548
517	sub size_allocate {	549	sub size_allocate {
518	my ($self, $w, $h) = @_;	550	my ($self, $x, $y, $w, $h) = @_;
519		551
520	return unless $self->{w} != $w \|\| $self->{h} != $h;	552	$self->_size_allocate ($x, $y, $w, $h) or return;
521		553
522	$self->SUPER::size_allocate ($w, $h);
523
524	$h -= $tex[1]->{height};	554	$h -= $tex[1]{h};
525	$h -= $tex[4]->{height};	555	$h -= $tex[4]{h};
526	$w -= $tex[2]->{width};	556	$w -= $tex[2]{w};
527	$w -= $tex[3]->{width};	557	$w -= $tex[3]{w};
528		558
529	$h = $h < 0 ? 0 : $h;	559	$h = $h < 0 ? 0 : $h;
530	$w = $w < 0 ? 0 : $w;	560	$w = $w < 0 ? 0 : $w;
531		561
532	my $child = $self->child;	562	my $child = $self->child;
533		563
534	$child->size_allocate ($w, $h);	564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
535	$child->move ($tex[3]->{width}, $tex[1]->{height});	565	}
		566
		567	sub button_down {
		568	my ($self, $ev, $x, $y) = @_;
		569
		570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
		571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
		572
		573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		574	my ($bw, $bh) = ($self->{w}, $self->{h});
		575
		576	$self->{motion} = sub {
		577	my ($ev, $x, $y) = @_;
		578
		579	($x, $y) = ($ev->motion_x, $ev->motion_y);
		580
		581	$self->{user_w} = $bw + $x - $ox;
		582	$self->{user_h} = $bh + $y - $oy;
		583	$self->update;
		584	};
		585
		586	} elsif ($x >= 0 && $x < $self->{w}
		587	&& $y >= 0 && $y < $tex[1]{h}) {
		588
		589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		590	my ($bx, $by) = ($self->{x}, $self->{y});
		591
		592	$self->{motion} = sub {
		593	my ($ev, $x, $y) = @_;
		594
		595	($x, $y) = ($ev->motion_x, $ev->motion_y);
		596
		597	$self->move ($bx + $x - $ox, $by + $y - $oy);
		598	$self->update;
		599	};
		600	}
		601	}
		602
		603	sub button_up {
		604	my ($self, $ev, $x, $y) = @_;
		605
		606	delete $self->{motion};
		607	}
		608
		609	sub mouse_motion {
		610	my ($self, $ev, $x, $y) = @_;
		611
		612	$self->{motion}->($ev, $x, $y) if $self->{motion};
536	}	613	}
537		614
538	sub _draw {	615	sub _draw {
539	my ($self) = @_;	616	my ($self) = @_;
540		617
541	my ($w, $h) = ($self->{w}, $self->{h});	618	my ($w, $h) = ($self->{w}, $self->{h});
542	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
543		620
544	glEnable GL_BLEND;	621	glEnable GL_BLEND;
		622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
545	glEnable GL_TEXTURE_2D;	623	glEnable GL_TEXTURE_2D;
546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
548		625
549	my $top = $tex[1];	626	my $top = $tex[1];
550	$top->draw_quad (0, 0, $w, $top->{height});	627	$top->draw_quad (0, 0, $w, $top->{h});
551		628
552	my $left = $tex[3];	629	my $left = $tex[3];
553	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);	630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);
554		631
555	my $right = $tex[2];	632	my $right = $tex[2];
556	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);	633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
557		634
558	my $bottom = $tex[4];	635	my $bottom = $tex[4];
559	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});	636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
560		637
561	my $bg = $tex[0];	638	my $bg = $tex[0];
		639
562	glBindTexture GL_TEXTURE_2D, $bg->{name};	640	glBindTexture GL_TEXTURE_2D, $bg->{name};
563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
564	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	642	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
565	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	643	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
566		644
567	my $rep_x = $cw / $bg->{width};	645	my $rep_x = $cw / $bg->{w};
568	my $rep_y = $ch / $bg->{height};	646	my $rep_y = $ch / $bg->{h};
569		647
570	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);	648	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
571		649
		650	glDisable GL_TEXTURE_2D;
572	glDisable GL_BLEND;	651	glDisable GL_BLEND;
573	glDisable GL_TEXTURE_2D;
574		652
575	$self->child->draw;	653	$self->child->draw;
576		654
577	}	655	}
578		656
579	#############################################################################	657	#############################################################################
580		658
581	package CFClient::Widget::Table;	659	package CFClient::UI::Table;
582		660
583	our @ISA = CFClient::Widget::Bin::;	661	our @ISA = CFClient::UI::Base::;
		662
		663	use List::Util qw(max sum);
584		664
585	use SDL::OpenGL;	665	use SDL::OpenGL;
		666
		667	sub new {
		668	my $class = shift;
		669
		670	$class->SUPER::new (
		671	col_expand => [],
		672	@_
		673	)
		674	}
586		675
587	sub add {	676	sub add {
588	my ($self, $x, $y, $chld) = @_;	677	my ($self, $x, $y, $chld) = @_;
589	my $old_chld = $self->{children}[$y][$x];
590		678
591	$self->{children}[$y][$x] = $chld;	679	$self->{children}[$y][$x] = $chld;
592	$chld->set_parent ($self);	680	$chld->set_parent ($self);
		681
		682	$self->{w} = $self->{h} = -1;
593	$self->update;	683	$self->update;
594	}	684	}
595		685
596	sub max_row_height {	686	sub get_wh {
597	my ($self, $row) = @_;	687	my ($self) = @_;
598		688
599	my $hs = 0;	689	my (@w, @h);
600	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {	690
		691	for my $y (0 .. $#{$self->{children}}) {
601	my $c = $self->{children}->[$row]->[$xi];	692	my $row = $self->{children}[$y]
602	if ($c) {	693	or next;
		694
		695	for my $x (0 .. $#$row) {
		696	my $widget = $row->[$x]
		697	or next;
603	my ($w, $h) = $c->size_request;	698	my ($w, $h) = $widget->size_request;
604	if ($hs < $h) { $hs = $h }	699
		700	$w[$x] = max $w[$x], $w;
		701	$h[$y] = max $h[$y], $h;
605	}	702	}
606	}	703	}
607	return $hs;
608	}
609		704
610	sub max_col_width {	705	(\@w, \@h)
		706	}
		707
		708	sub size_request {
611	my ($self, $col) = @_;	709	my ($self) = @_;
612		710
		711	my ($ws, $hs) = $self->get_wh;
		712
		713	(
		714	(sum @$ws),
		715	(sum @$hs),
		716	)
		717	}
		718
		719	sub size_allocate {
		720	my ($self, $x, $y, $w, $h) = @_;
		721
		722	$self->_size_allocate ($x, $y, $w, $h) or return;
		723
		724	my ($ws, $hs) = $self->get_wh;
		725
		726	my $req_w = sum @$ws;
		727	my $req_h = sum @$hs;
		728
		729	# TODO: nicer code && do row_expand
		730	my @col_expand = @{$self->{col_expand}};
		731	@col_expand = (1) x @$ws unless @col_expand;
		732	my $col_expand = (sum @col_expand) \|\| 1;
		733
		734	# linearly scale sizes
		735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
		736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		737
		738	my $y;
		739
		740	for my $r (0 .. $#{$self->{children}}) {
		741	my $row = $self->{children}[$r]
		742	or next;
		743
613	my $ws = 0;	744	my $x = 0;
614	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {	745	my $row_h = $hs->[$r];
615	my $c = ($self->{children}->[$yi] \|\| [])->[$col];	746
616	if ($c) {	747	for my $c (0 .. $#$row) {
617	my ($w, $h) = $c->size_request;	748	my $widget = $row->[$c]
618	if ($ws < $w) { $ws = $w }	749	or next;
		750
		751	my $col_w = $ws->[$c];
		752
		753	$widget->size_allocate ($x, $y, $col_w, $row_h);
		754
		755	$x += $col_w;
619	}	756	}
		757
		758	$y += $row_h;
620	}	759	}
621	return $ws;	760
622	}	761	}
		762
		763	sub find_widget {
		764	my ($self, $x, $y) = @_;
		765
		766	$x -= $self->{x};
		767	$y -= $self->{y};
		768
		769	my $res;
		770
		771	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		772	$res = $_->find_widget ($x, $y)
		773	and return $res;
		774	}
		775
		776	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		777	}
		778
		779	sub _draw {
		780	my ($self) = @_;
		781
		782	for (grep $_, @{$self->{children}}) {
		783	$_->draw for grep $_, @$_;
		784	}
		785	}
		786
		787	#############################################################################
		788
		789	package CFClient::UI::HBox;
		790
		791	# TODO: wrap into common Box base class
		792
		793	our @ISA = CFClient::UI::Container::;
623		794
624	sub size_request {	795	sub size_request {
625	my ($self) = @_;	796	my ($self) = @_;
626		797
		798	my @alloc = map [$_->size_request], @{$self->{children}};
		799
		800	(
		801	(List::Util::sum map $_->[0], @alloc),
		802	(List::Util::max map $_->[1], @alloc),
		803	)
		804	}
		805
		806	sub size_allocate {
		807	my ($self, $x, $y, $w, $h) = @_;
		808
		809	$self->_size_allocate ($x, $y, $w, $h) or return;
		810
		811	return unless $self->{w};
		812
627	my ($hs, $ws) = (0, 0);	813	($h, $w) = ($w, $h);
628		814
629	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	815	my $children = $self->{children};
630	$hs += $self->max_row_height ($yi);
631	}
632		816
633	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	817	my @h = map +($_->size_request)[0], @$children;
634	my $wm = 0;	818
635	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	819	my $req_h = List::Util::sum @h;
636	$wm += $self->max_col_width ($xi)	820
		821	if ($req_h > $h) {
		822	# ah well, not enough space
		823	$_ *= $h / $req_h for @h;
		824	} else {
		825	my $exp = List::Util::sum map $_->{expand}, @$children;
		826	$exp \|\|= 1;
		827
		828	for (0 .. $#$children) {
		829	my $child = $children->[$_];
		830
		831	my $alloc_h = $h[$_];
		832	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		833	$h[$_] = $alloc_h;
637	}	834	}
638	if ($ws < $wm) { $ws = $wm }
639	}	835	}
640
641	return ($ws, $hs);
642	}
643
644	sub _draw {
645	my ($self) = @_;
646		836
647	my $y = 0;	837	my $y = 0;
648	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	838	for (0 .. $#$children) {
		839	my $child = $children->[$_];
649	my $x = 0;	840	my $h = $h[$_];
		841	$child->size_allocate ($y, 0, $h, $w);
650		842
651	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	843	$y += $h;
652
653	my $c = $self->{children}->[$yi]->[$xi];
654	if ($c) {
655	$c->move ($x, $y, 0); #TODO: Move to size_request
656	$c->draw if $c;
657	}
658
659	$x += $self->max_col_width ($xi);
660	}
661
662	$y += $self->max_row_height ($yi);
663	}	844	}
664	}	845	}
665		846
666	#############################################################################	847	#############################################################################
667		848
668	package CFClient::Widget::VBox;	849	package CFClient::UI::VBox;
669		850
		851	# TODO: wrap into common Box base class
		852
670	our @ISA = CFClient::Widget::Container::;	853	our @ISA = CFClient::UI::Container::;
671
672	use SDL::OpenGL;
673		854
674	sub size_request {	855	sub size_request {
675	my ($self) = @_;	856	my ($self) = @_;
676		857
677	my @alloc = map [$_->size_request], @{$self->{children}};	858	my @alloc = map [$_->size_request], @{$self->{children}};
…		…
681	(List::Util::sum map $_->[1], @alloc),	862	(List::Util::sum map $_->[1], @alloc),
682	)	863	)
683	}	864	}
684		865
685	sub size_allocate {	866	sub size_allocate {
686	my ($self, $w, $h) = @_;	867	my ($self, $x, $y, $w, $h) = @_;
687		868
688	return unless $self->{w} != $w \|\| $self->{h} != $h;	869	$self->_size_allocate ($x, $y, $w, $h) or return;
689
690	$self->{w} = $w;
691	$self->{h} = $h;
692		870
693	return unless $self->{h};	871	return unless $self->{h};
694		872
695	my $children = $self->{children};	873	my $children = $self->{children};
696		874
…		…
698		876
699	my $req_h = List::Util::sum @h;	877	my $req_h = List::Util::sum @h;
700		878
701	if ($req_h > $h) {	879	if ($req_h > $h) {
702	# ah well, not enough space	880	# ah well, not enough space
703	$_ = $h[$_] * $h / $req_h for @h;	881	$_ *= $h / $req_h for @h;
704	} else {	882	} else {
705	my @exp = grep $_->{expand}, @$children;	883	my $exp = List::Util::sum map $_->{expand}, @$children;
706	@exp = @$children unless @exp;	884	$exp \|\|= 1;
707		885
708	my %exp = map +($_ => 1), @exp;
709
710	for (0 .. $#$children) {	886	for (0 .. $#$children) {
711	my $child = $children->[$_];	887	my $child = $children->[$_];
712		888
713	my $alloc_h = $h[$_];	889	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
714	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
715	$h[$_] = $alloc_h;
716	}	890	}
717	}	891	}
718		892
719	my $y = 0;	893	my $y = 0;
720	for (0 .. $#$children) {	894	for (0 .. $#$children) {
721	my $child = $children->[$_];	895	my $child = $children->[$_];
722	my $h = $h[$_];	896	my $h = $h[$_];
723	$child->move (0, $y);
724	$child->size_allocate ($w, $h);	897	$child->size_allocate (0, $y, $w, $h);
725		898
726	$y += $h;	899	$y += $h;
727	}	900	}
728	}	901	}
729		902
730	#############################################################################	903	#############################################################################
731		904
732	package CFClient::Widget::Label;	905	package CFClient::UI::Label;
733		906
734	our @ISA = CFClient::Widget::;	907	our @ISA = CFClient::UI::Base::;
735		908
736	use SDL::OpenGL;	909	use SDL::OpenGL;
737		910
738	sub new {	911	sub new {
739	my ($class, %arg) = @_;	912	my ($class, %arg) = @_;
740		913
741	my $self = $class->SUPER::new (	914	my $self = $class->SUPER::new (
742	fg => [1, 1, 1],	915	fg => [1, 1, 1],
743	height => $::FONTSIZE,	916	height => $::FONTSIZE,
744	text => "",	917	text => "",
		918	align => -1,
		919	padding => 2,
745	layout => new CFClient::Layout,	920	layout => new CFClient::Layout,
746	%arg	921	%arg
747	);	922	);
748		923
749	$self->set_text ($self->{text});	924	$self->set_text ($self->{text});
750		925
…		…
780	sub size_request {	955	sub size_request {
781	my ($self) = @_;	956	my ($self) = @_;
782		957
783	$self->{layout}->set_width;	958	$self->{layout}->set_width;
784	$self->{layout}->set_height ($self->{height});	959	$self->{layout}->set_height ($self->{height});
785	$self->{layout}->size	960	my ($w, $h) = $self->{layout}->size;
786	# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack	961
787	# (	962	(
788	# $self->{texture}{width},	963	$w + $self->{padding} * 2,
789	# $self->{texture}{height},	964	$h + $self->{padding} * 2,
790	# )	965	)
791	# } else {
792	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793	#
794	# ($w, $h)
795	# }
796	}	966	}
797		967
798	sub size_allocate {	968	sub size_allocate {
799	my ($self, $w, $h) = @_;	969	my ($self, $x, $y, $w, $h) = @_;
800		970
801	return unless $self->{w} != $w \|\| $self->{h} != $h;	971	$self->_size_allocate ($x, $y, $w, $h) or return;
802		972
803	$self->SUPER::size_allocate ($w, $h);
804	delete $self->{texture};	973	delete $self->{texture};
805	}	974	}
806		975
807	sub update {	976	sub update {
808	my ($self) = @_;	977	my ($self) = @_;
…		…
814	sub _draw {	983	sub _draw {
815	my ($self) = @_;	984	my ($self) = @_;
816		985
817	my $tex = $self->{texture} \|\|= do {	986	my $tex = $self->{texture} \|\|= do {
818	$self->{layout}->set_width ($self->{w});	987	$self->{layout}->set_width ($self->{w});
		988	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});
819	new_from_layout CFClient::Texture $self->{layout};	989	new_from_layout CFClient::Texture $self->{layout}
820	};	990	};
821		991
822	glEnable GL_BLEND;	992	glEnable GL_BLEND;
		993	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
823	glEnable GL_TEXTURE_2D;	994	glEnable GL_TEXTURE_2D;
824	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
825	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	995	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826		996
827	glColor @{$self->{fg}};	997	glColor @{$self->{fg}};
828		998
829	$tex->draw_quad (0, 0);	999	my $x =
		1000	$self->{align} < 0 ? $self->{padding}
		1001	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1002	: ($self->{w} - $tex->{w}) * 0.5;
830		1003
		1004	$tex->draw_quad ($x, $self->{padding});
		1005
		1006	glDisable GL_TEXTURE_2D;
831	glDisable GL_BLEND;	1007	glDisable GL_BLEND;
832	glDisable GL_TEXTURE_2D;
833	}	1008	}
834		1009
835	#############################################################################	1010	#############################################################################
836		1011
837	package CFClient::Widget::Entry;	1012	package CFClient::UI::Entry;
838		1013
839	our @ISA = CFClient::Widget::Label::;	1014	our @ISA = CFClient::UI::Label::;
840		1015
841	use SDL;	1016	use SDL;
842	use SDL::OpenGL;	1017	use SDL::OpenGL;
843		1018
844	sub new {	1019	sub new {
845	my $class = shift;	1020	my $class = shift;
846		1021
847	$class->SUPER::new (	1022	$class->SUPER::new (
848	fg => [1, 1, 1],	1023	fg => [1, 1, 1],
849	bg => [0, 0, 0, 0.4],	1024	bg => [0, 0, 0, 0.2],
850	active_bg => [1, 1, 1],	1025	active_bg => [1, 1, 1, 0.5],
851	active_fg => [0, 0, 0],	1026	active_fg => [0, 0, 0],
852	@_	1027	@_
853	)	1028	)
854	}	1029	}
855		1030
…		…
858		1033
859	$self->{last_activity} = $::NOW;	1034	$self->{last_activity} = $::NOW;
860		1035
861	$self->{text} = $text;	1036	$self->{text} = $text;
862	$self->{layout}->set_width ($self->{w});	1037	$self->{layout}->set_width ($self->{w});
		1038
		1039	$text =~ s/./*/g if $self->{hidden};
		1040
863	$self->{layout}->set_markup ($self->escape_text ($text));	1041	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
864		1042
865	$text = substr $text, 0, $self->{cursor};	1043	$text = substr $text, 0, $self->{cursor};
866	utf8::encode $text;	1044	utf8::encode $text;
867		1045
868	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1046	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
…		…
875		1053
876	($w + 1, $h) # add 1 for cursor	1054	($w + 1, $h) # add 1 for cursor
877	}	1055	}
878		1056
879	sub size_allocate {	1057	sub size_allocate {
880	my ($self, $w, $h) = @_;	1058	my ($self, $x, $y, $w, $h) = @_;
881		1059
882	return unless $self->{w} != $w \|\| $self->{h} != $h;
883
884	$self->SUPER::size_allocate ($w, $h);	1060	$self->SUPER::size_allocate ($x, $y, $w, $h);
885		1061
886	$self->_set_text ($self->{text});	1062	$self->_set_text ($self->{text});
887	}	1063	}
888		1064
889	sub set_text {	1065	sub set_text {
…		…
910	substr $text, $self->{cursor}, 1, "";	1086	substr $text, $self->{cursor}, 1, "";
911	} elsif ($sym == SDLK_LEFT) {	1087	} elsif ($sym == SDLK_LEFT) {
912	--$self->{cursor} if $self->{cursor};	1088	--$self->{cursor} if $self->{cursor};
913	} elsif ($sym == SDLK_RIGHT) {	1089	} elsif ($sym == SDLK_RIGHT) {
914	++$self->{cursor} if $self->{cursor} < length $self->{text};	1090	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1091	} elsif ($sym == SDLK_HOME) {
		1092	$self->{cursor} = 0;
		1093	} elsif ($sym == SDLK_END) {
		1094	$self->{cursor} = length $text;
915	} elsif ($uni) {	1095	} elsif ($uni) {
916	substr $text, $self->{cursor}++, 0, chr $uni;	1096	substr $text, $self->{cursor}++, 0, chr $uni;
917	}	1097	}
918		1098
919	$self->_set_text ($text);	1099	$self->_set_text ($text);
…		…
934	$self->SUPER::button_down ($ev, $x, $y);	1114	$self->SUPER::button_down ($ev, $x, $y);
935		1115
936	my $idx = $self->{layout}->xy_to_index ($x, $y);	1116	my $idx = $self->{layout}->xy_to_index ($x, $y);
937		1117
938	# byte-index to char-index	1118	# byte-index to char-index
939	my $text = $self->{layout};	1119	my $text = $self->{text};
940	utf8::encode $text;	1120	utf8::encode $text;
941	$self->{cursor} = length substr $text, 0, $idx;	1121	$self->{cursor} = length substr $text, 0, $idx;
942		1122
943	$self->_set_text ($self->{text});	1123	$self->_set_text ($self->{text});
944	$self->update;	1124	$self->update;
…		…
959	$self->{fg} = $self->{active_fg};	1139	$self->{fg} = $self->{active_fg};
960	} else {	1140	} else {
961	glColor @{$self->{bg}};	1141	glColor @{$self->{bg}};
962	}	1142	}
963		1143
		1144	glEnable GL_BLEND;
		1145	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
964	glBegin GL_QUADS;	1146	glBegin GL_QUADS;
965	glVertex 0 , 0;	1147	glVertex 0 , 0;
966	glVertex 0 , $self->{h};	1148	glVertex 0 , $self->{h};
967	glVertex $self->{w}, $self->{h};	1149	glVertex $self->{w}, $self->{h};
968	glVertex $self->{w}, 0;	1150	glVertex $self->{w}, 0;
969	glEnd;	1151	glEnd;
		1152	glDisable GL_BLEND;
970		1153
971	$self->SUPER::_draw;	1154	$self->SUPER::_draw;
972		1155
973	#TODO: force update every cursor change :(	1156	#TODO: force update every cursor change :(
974	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1157	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
…		…
980	}	1163	}
981	}	1164	}
982		1165
983	#############################################################################	1166	#############################################################################
984		1167
985	package CFClient::Widget::Slider;	1168	package CFClient::UI::Button;
986		1169
987	use strict;	1170	our @ISA = CFClient::UI::Label::;
988		1171
		1172	use SDL;
989	use SDL::OpenGL;	1173	use SDL::OpenGL;
990	use SDL::OpenGL::Constants;
991
992	our @ISA = CFClient::Widget::DrawBG::;
993
994	sub size_request {
995	my ($self) = @_;
996
997	my $w = 20;
998	my $h = 10;
999
1000	$self->{vertical} ? ($h, $w) : ($w, $h)
1001	}
1002		1174
1003	sub new {	1175	sub new {
1004	my $class = shift;	1176	my $class = shift;
1005		1177
		1178	$class->SUPER::new (
		1179	padding => 4,
		1180	fg => [1, 1, 1],
		1181	bg => [1, 1, 1, 0.2],
		1182	active_bg => [0, 0, 0, 0.5],
		1183	active_fg => [1, 1, 0],
		1184	border_fg => [1, 1, 0],
		1185	@_
		1186	)
		1187	}
		1188
		1189	sub button_up {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($x >= 0 && $x < $self->{w}
		1193	&& $y >= 0 && $y < $self->{h}) {
		1194	$self->emit ("activate");
		1195	}
		1196	}
		1197
		1198	sub _draw {
		1199	my ($self) = @_;
		1200
		1201	local $self->{fg} = $self->{fg};
		1202
		1203	glEnable GL_BLEND;
		1204	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1205
		1206	glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
		1207
		1208	glBegin GL_LINE_LOOP;
		1209	glColor @{$self->{border_fg}};
		1210	glVertex 1 , 1;
		1211	glVertex 1 , $self->{h} - 2;
		1212	glVertex $self->{w} - 2, $self->{h} - 2;
		1213	glVertex $self->{w} - 2, 1;
		1214	glEnd;
		1215
		1216	if ($GRAB == $self) {
		1217	glColor @{$self->{active_bg}};
		1218	$self->{fg} = $self->{active_fg};
		1219	} else {
		1220	glColor @{$self->{bg}};
		1221	}
		1222
		1223	glBegin GL_QUADS;
		1224	glVertex 2 , 2;
		1225	glVertex 2 , $self->{h} - 2;
		1226	glVertex $self->{w} - 2, $self->{h} - 2;
		1227	glVertex $self->{w} - 2, 2;
		1228	glEnd;
		1229	glDisable GL_BLEND;
		1230
		1231	$self->SUPER::_draw;
		1232	}
		1233
		1234	#############################################################################
		1235
		1236	package CFClient::UI::Slider;
		1237
		1238	use strict;
		1239
		1240	use SDL::OpenGL;
		1241
		1242	our @ISA = CFClient::UI::DrawBG::;
		1243
		1244	sub new {
		1245	my $class = shift;
		1246
1006	# range [value, low, high, page]	1247	# range [value, low, high, page]
1007		1248
1008	$class->SUPER::new (	1249	my $self = $class->SUPER::new (
1009	fg => [1, 1, 1],	1250	fg => [1, 1, 1],
1010	active_fg => [0, 0, 0],	1251	active_fg => [0, 0, 0],
1011	range => [0, 0, 100, 10],	1252	range => [0, 0, 100, 10],
		1253	req_w => 40,
		1254	req_h => 10,
1012	vertical => 0,	1255	vertical => 0,
1013	@_	1256	@_
1014	)	1257	);
		1258
		1259	$self
		1260	}
		1261
		1262	sub size_request {
		1263	my ($self) = @_;
		1264
		1265	my $w = $self->{req_w};
		1266	my $h = $self->{req_h};
		1267
		1268	$self->{vertical} ? ($h, $w) : ($w, $h)
1015	}	1269	}
1016		1270
1017	sub button_down {	1271	sub button_down {
1018	my ($self, $ev, $x, $y) = @_;	1272	my ($self, $ev, $x, $y) = @_;
1019		1273
…		…
1025	my ($self, $ev, $x, $y) = @_;	1279	my ($self, $ev, $x, $y) = @_;
1026		1280
1027	if ($GRAB == $self) {	1281	if ($GRAB == $self) {
1028	my ($value, $lo, $hi, $page) = @{$self->{range}};	1282	my ($value, $lo, $hi, $page) = @{$self->{range}};
1029		1283
		1284	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		1285
1030	$x = $x * ($hi - $lo) / $self->{w} + $lo;	1286	$x = $x * ($hi - $lo) / $w + $lo;
1031	$x = $lo if $x < $lo;	1287	$x = $lo if $x < $lo;
1032	$x = $hi - $page if $x > $hi - $page;	1288	$x = $hi - $page if $x > $hi - $page;
1033	$self->{range}[0] = $x;	1289	$self->{range}[0] = $x;
1034		1290
1035	$self->{changed}($x) if $self->{changed};	1291	$self->emit (changed => $x);
1036	$self->update;	1292	$self->update;
1037	}	1293	}
1038	}	1294	}
1039		1295
1040	sub _draw {	1296	sub _draw {
1041	my ($self) = @_;	1297	my ($self) = @_;
1042		1298
1043	$self->SUPER::_draw ();	1299	$self->SUPER::_draw ();
1044
1045	glPushMatrix;
1046		1300
1047	my ($w, $h) = @$self{qw(w h)};	1301	my ($w, $h) = @$self{qw(w h)};
1048		1302
1049	if ($self->{vertical}) {	1303	if ($self->{vertical}) {
1050	# draw a vertical slider like a rotated horizontal slider	1304	# draw a vertical slider like a rotated horizontal slider
1051		1305
1052	glTranslate 0, $self->{w};
1053	glRotate 90, 0, 0, 1;	1306	glRotate 90, 0, 0, 1;
		1307	glTranslate 0, -$self->{w}, 0;
1054		1308
1055	($w, $h) = ($h, $w);	1309	($w, $h) = ($h, $w);
1056	}	1310	}
1057		1311
1058	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1312	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
…		…
1064	$value = int +($value - $lo) * $w / ($hi - $lo);	1318	$value = int +($value - $lo) * $w / ($hi - $lo);
1065		1319
1066	$w -= $page;	1320	$w -= $page;
1067	$page &= ~1;	1321	$page &= ~1;
1068	glTranslate $page * 0.5, 0, 0;	1322	glTranslate $page * 0.5, 0, 0;
		1323	$page \|\|= 2;
1069		1324
1070	glColor @$fg;	1325	glColor @$fg;
1071	glBegin GL_LINES;	1326	glBegin GL_LINES;
1072	glVertex 0, 0; glVertex 0, $h;	1327	glVertex 0, 0; glVertex 0, $h;
1073	glVertex $w - 1, 0; glVertex $w - 1, $h;	1328	glVertex $w - 1, 0; glVertex $w - 1, $h;
…		…
1090	glVertex $knob_a + 1, $h - 1;	1345	glVertex $knob_a + 1, $h - 1;
1091	glVertex $knob_b - 1, $h - 1;	1346	glVertex $knob_b - 1, $h - 1;
1092	glVertex $knob_b - 1, 1;	1347	glVertex $knob_b - 1, 1;
1093	}	1348	}
1094	glEnd;	1349	glEnd;
1095
1096	glPopMatrix;
1097	}	1350	}
1098		1351
1099	#############################################################################	1352	#############################################################################
1100		1353
1101	package CFClient::Widget::MapWidget;	1354	package CFClient::UI::MapWidget;
1102		1355
1103	use strict;	1356	use strict;
1104		1357
1105	use List::Util qw(min max);	1358	use List::Util qw(min max);
1106		1359
1107	use SDL;	1360	use SDL;
1108	use SDL::OpenGL;	1361	use SDL::OpenGL;
1109	use SDL::OpenGL::Constants;
1110		1362
1111	our @ISA = CFClient::Widget::;	1363	our @ISA = CFClient::UI::Base::;
1112		1364
1113	sub new {	1365	sub new {
1114	my $class = shift;	1366	my $class = shift;
1115		1367
1116	$class->SUPER::new (	1368	$class->SUPER::new (
…		…
1127	sub key_up {	1379	sub key_up {
1128	}	1380	}
1129		1381
1130	sub size_request {	1382	sub size_request {
1131	(	1383	(
1132	1 + int $::WIDTH / 32,	1384	1 + 32 * int $::WIDTH / 32,
1133	1 + int $::HEIGHT / 32,	1385	1 + 32 * int $::HEIGHT / 32,
1134	)	1386	)
1135	}	1387	}
1136		1388
1137	sub update {	1389	sub update {
1138	my ($self) = @_;	1390	my ($self) = @_;
1139		1391
1140	$self->{need_update} = 1;	1392	$self->{need_update} = 1;
		1393	$self->SUPER::update;
1141	}	1394	}
1142		1395
1143	sub _draw {	1396	sub draw {
1144	my ($self) = @_;	1397	my ($self) = @_;
1145		1398
1146	if (delete $self->{need_update}) {	1399	if (delete $self->{need_update}) {
1147	glNewList $self->{list}, GL_COMPILE;	1400	glNewList $self->{list}, GL_COMPILE;
1148		1401
…		…
1168	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1421	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1169	}	1422	}
1170		1423
1171	glEnable GL_TEXTURE_2D;	1424	glEnable GL_TEXTURE_2D;
1172	glEnable GL_BLEND;	1425	glEnable GL_BLEND;
		1426	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1173	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1174		1428
1175	my $sw4 = ($sw + 3) & ~3;	1429	my $sw4 = ($sw + 3) & ~3;
1176	my $darkness = "\x00" x ($sw4 * $sh);	1430	my $darkness = "\x00" x ($sw4 * $sh);
1177		1431
…		…
1190	}	1444	}
1191		1445
1192	for my $num (grep $_, @$cell[1,2,3]) {	1446	for my $num (grep $_, @$cell[1,2,3]) {
1193	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1447	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
1194		1448
1195	my $w = $tex->{width};	1449	my ($w, $h) = @$tex{qw(w h)};
1196	my $h = $tex->{height};
1197		1450
1198	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1451	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1199	}	1452	}
1200	}	1453	}
1201	}	1454	}
…		…
1208	#	1461	#
1209	# $lighting = $pb->get_pixels;	1462	# $lighting = $pb->get_pixels;
1210	# $lighting =~ s/(.)../$1/gs;	1463	# $lighting =~ s/(.)../$1/gs;
1211	# }	1464	# }
1212		1465
1213	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1466	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215		1467
1216	$darkness = new CFClient::Texture	1468	$darkness = new CFClient::Texture
1217	width => $sw4,	1469	w => $sw4,
1218	height => $sh,	1470	h => $sh,
1219	data => $darkness,	1471	data => $darkness,
1220	internalformat => GL_ALPHA,	1472	internalformat => GL_ALPHA,
1221	format => GL_ALPHA;	1473	format => GL_ALPHA;
1222		1474
1223	glColor 0.45, 0.45, 0.45, 1;	1475	glColor 0.45, 0.45, 0.45, 1;
…		…
1283	}	1535	}
1284	}	1536	}
1285		1537
1286	#############################################################################	1538	#############################################################################
1287		1539
1288	package CFClient::Widget::Animator;	1540	package CFClient::UI::Animator;
1289		1541
1290	use SDL::OpenGL;	1542	use SDL::OpenGL;
1291		1543
1292	our @ISA = CFClient::Widget::Bin::;	1544	our @ISA = CFClient::UI::Bin::;
1293		1545
1294	sub moveto {	1546	sub moveto {
1295	my ($self, $x, $y) = @_;	1547	my ($self, $x, $y) = @_;
1296		1548
1297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1549	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
1325	glPopMatrix;	1577	glPopMatrix;
1326	}	1578	}
1327		1579
1328	#############################################################################	1580	#############################################################################
1329		1581
1330	package CFClient::Widget::Toplevel;	1582	package CFClient::UI::Toplevel;
1331		1583
1332	our @ISA = CFClient::Widget::Container::;	1584	our @ISA = CFClient::UI::Container::;
1333		1585
1334	sub size_request {	1586	sub size_request {
1335	($::WIDTH, $::HEIGHT)	1587	($::WIDTH, $::HEIGHT)
1336	}	1588	}
1337		1589
1338	sub size_allocate {	1590	sub size_allocate {
1339	my ($self, $w, $h) = @_;	1591	my ($self, $x, $y, $w, $h) = @_;
1340		1592
1341	$self->SUPER::size_allocate ($w, $h);	1593	$self->_size_allocate ($x, $y, $w, $h);
1342		1594
1343	$_->size_allocate ($_->size_request)	1595	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1344	for @{$self->{children}};	1596	for @{$self->{children}};
1345	}	1597	}
1346		1598
1347	sub translate {	1599	sub translate {
1348	my ($self, $x, $y) = @_;	1600	my ($self, $x, $y) = @_;
…		…
1351	}	1603	}
1352		1604
1353	sub update {	1605	sub update {
1354	my ($self) = @_;	1606	my ($self) = @_;
1355		1607
1356	$self->size_allocate ($self->size_request);	1608	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1357	::refresh ();	1609	::refresh ();
1358	}	1610	}
1359		1611
1360	sub add {	1612	sub add {
1361	my ($self, $widget) = @_;	1613	my ($self, $widget) = @_;
1362		1614
1363	$self->SUPER::add ($widget);	1615	$self->SUPER::add ($widget);
1364		1616
1365	$widget->size_allocate ($widget->size_request);	1617	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1366	}	1618	}
1367		1619
1368	sub draw {	1620	sub draw {
1369	my ($self) = @_;	1621	my ($self) = @_;
1370		1622
1371	$self->_draw;	1623	$self->_draw;
1372	}	1624	}
1373		1625
1374	#############################################################################	1626	#############################################################################
1375		1627
1376	package CFClient::Widget;	1628	package CFClient::UI;
1377		1629
1378	$TOPLEVEL = new CFClient::Widget::Toplevel;	1630	$TOPLEVEL = new CFClient::UI::Toplevel;
1379		1631
1380	1	1632	1
1381		1633

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.69 by root, Tue Apr 11 17:32:14 2006 UTC vs. Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.69 by root, Tue Apr 11 17:32:14 2006 UTC vs.
Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC