ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.65 by root, Tue Apr 11 14:04:27 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER;
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}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
74 80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 bless {
… …
114} 120}
115 121
116sub focus_in { 122sub focus_in {
117 my ($self) = @_; 123 my ($self) = @_;
118 124
125 return if $FOCUS == $self;
126
119 my $focus = $FOCUS; $FOCUS = $self; 127 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 128 $focus->update if $focus;
121 $FOCUS->update; 129 $FOCUS->update;
122} 130}
123 131
… …
130 $focus->update if $focus; #? 138 $focus->update if $focus; #?
131} 139}
132 140
133sub mouse_motion { } 141sub mouse_motion { }
134sub button_up { } 142sub button_up { }
135sub button_down { }
136sub key_down { } 143sub key_down { }
137sub key_up { } 144sub key_up { }
145
146sub button_down {
147 my ($self, $ev, $x, $y) = @_;
148
149 $self->focus_in;
150}
138 151
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 152sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 153sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 154sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 155sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 156sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 157
145sub draw { 158sub draw {
146 my ($self) = @_; 159 my ($self) = @_;
147 160
161 return unless $self->{h} && $self->{w};
162
148 glPushMatrix; 163 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 164 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 165 $self->_draw;
166 glPopMatrix;
167
151 if ($self == $HOVER) { 168 if ($self == $HOVER) {
169 my ($x, $y) = @$self{qw(x y)};
170
152 glColor 1, 1, 1, 0.4; 171 glColor 1, 1, 1, 0.1;
153 glEnable GL_BLEND; 172 glEnable GL_BLEND;
173 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 174 glBegin GL_QUADS;
155 glVertex 0 , 0; 175 glVertex $x , $y;
156 glVertex $self->{w}, 0; 176 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 177 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 178 glVertex $x , $y + $self->{h};
159 glEnd; 179 glEnd;
160 glDisable GL_BLEND; 180 glDisable GL_BLEND;
161 } 181 }
162 glPopMatrix;
163} 182}
164 183
165sub _draw { 184sub _draw {
166 my ($self) = @_; 185 my ($self) = @_;
167 186
… …
207 226
208 $self->{parent}->update 227 $self->{parent}->update
209 if $self->{parent}; 228 if $self->{parent};
210} 229}
211 230
231sub connect {
232 my ($self, $signal, $cb) = @_;
233
234 push @{ $self->{cb}{$signal} }, $cb;
235}
236
237sub emit {
238 my ($self, $signal, @args) = @_;
239
240 $_->($self, @args)
241 for @{$self->{cb}{$signal} || []};
242}
243
212sub DESTROY { 244sub DESTROY {
213 my ($self) = @_; 245 my ($self) = @_;
214 246
215 #$self->deactivate; 247 #$self->deactivate;
216} 248}
217 249
218############################################################################# 250#############################################################################
219 251
252package CFClient::UI::DrawBG;
253
254our @ISA = CFClient::UI::Base::;
255
256use strict;
257use SDL::OpenGL;
258
259sub new {
260 my $class = shift;
261
262 # range [value, low, high, page]
263
264 $class->SUPER::new (
265 bg => [0, 0, 0, 0.4],
266 active_bg => [1, 1, 1],
267 @_
268 )
269}
270
271sub _draw {
272 my ($self) = @_;
273
274 my ($w, $h) = @$self{qw(w h)};
275
276 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
277 glBegin GL_QUADS;
278 glVertex 0 , 0;
279 glVertex 0 , $h;
280 glVertex $w, $h;
281 glVertex $w, 0;
282 glEnd;
283}
284
285#############################################################################
286
287package CFClient::UI::Empty;
288
289our @ISA = CFClient::UI::Base::;
290
291sub size_request {
292 (0, 0)
293}
294
295sub draw { }
296
297#############################################################################
298
220package CFClient::Widget::Container; 299package CFClient::UI::Container;
221 300
222our @ISA = CFClient::Widget::; 301our @ISA = CFClient::UI::Base::;
223 302
224sub new { 303sub new {
225 my ($class, %arg) = @_; 304 my ($class, %arg) = @_;
226 305
227 my $children = delete $arg{children} || []; 306 my $children = delete $arg{children} || [];
… …
236 my ($self, $chld, $expand) = @_; 315 my ($self, $chld, $expand) = @_;
237 316
238 $chld->{expand} = $expand; 317 $chld->{expand} = $expand;
239 $chld->set_parent ($self); 318 $chld->set_parent ($self);
240 319
241 @{$self->{children}} = 320 $self->{children} = [
242 sort { $a->{z} <=> $b->{z} } 321 sort { $a->{z} <=> $b->{z} }
243 @{$self->{children}}, $chld; 322 @{$self->{children}}, $chld
323 ];
244 324
245 $self->size_allocate ($self->{w}, $self->{h}) 325 $self->size_allocate ($self->{w}, $self->{h})
246 if $self->{w}; #TODO: check for "realised state" 326 if $self->{w}; #TODO: check for "realised state"
247} 327}
248 328
… …
276 $_->draw for @{$self->{children}}; 356 $_->draw for @{$self->{children}};
277} 357}
278 358
279############################################################################# 359#############################################################################
280 360
281package CFClient::Widget::Bin; 361package CFClient::UI::Bin;
282 362
283our @ISA = CFClient::Widget::Container::; 363our @ISA = CFClient::UI::Container::;
364
365sub new {
366 my ($class, %arg) = @_;
367
368 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
369
370 $class->SUPER::new (children => [$child], %arg)
371}
372
373sub add {
374 my ($self, $widget) = @_;
375
376 $self->{children} = [];
377
378 $self->SUPER::add ($widget);
379}
380
381sub remove {
382 my ($self, $widget) = @_;
383
384 $self->SUPER::remove ($widget);
385
386 $self->{children} = [new CFClient::UI::Empty]
387 unless @{$self->{children}};
388}
284 389
285sub child { $_[0]->{children}[0] } 390sub child { $_[0]->{children}[0] }
286 391
287sub size_request { 392sub size_request {
288 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 393 $_[0]{children}[0]->size_request
289} 394}
290 395
291sub size_allocate { 396sub size_allocate {
292 my ($self, $w, $h) = @_; 397 my ($self, $w, $h) = @_;
293 398
399 return unless $self->{w} != $w || $self->{h} != $h;
400
294 $self->SUPER::size_allocate ($w, $h); 401 $self->SUPER::size_allocate ($w, $h);
295 $self->{children}[0]->size_allocate ($w, $h) 402 $self->{children}[0]->size_allocate ($w, $h);
296 if $self->{children}[0]
297} 403}
298 404
299############################################################################# 405#############################################################################
300 406
301package CFClient::Widget::Window; 407package CFClient::UI::Window;
302 408
303our @ISA = CFClient::Widget::Bin::; 409our @ISA = CFClient::UI::Bin::;
304 410
305use SDL::OpenGL; 411use SDL::OpenGL;
306 412
307sub new { 413sub new {
308 my ($class, %arg) = @_; 414 my ($class, %arg) = @_;
… …
328} 434}
329 435
330sub size_allocate { 436sub size_allocate {
331 my ($self, $w, $h) = @_; 437 my ($self, $w, $h) = @_;
332 438
439 return unless $self->{w} != $w || $self->{h} != $h;
440
333 $self->{w} = $w; 441 $self->{w} = $w;
334 $self->{h} = $h; 442 $self->{h} = $h;
335 443
336 $self->child->size_allocate ($w, $h); 444 $self->child->size_allocate ($w, $h);
337 445
… …
345 453
346 my $tex = $self->{texture} 454 my $tex = $self->{texture}
347 or return; 455 or return;
348 456
349 glEnable GL_BLEND; 457 glEnable GL_BLEND;
458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
350 glEnable GL_TEXTURE_2D; 459 glEnable GL_TEXTURE_2D;
351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
352 461
353 $tex->draw_quad (0, 0, $w, $h); 462 $tex->draw_quad (0, 0, $w, $h);
354 463
… …
356 glDisable GL_TEXTURE_2D; 465 glDisable GL_TEXTURE_2D;
357} 466}
358 467
359############################################################################# 468#############################################################################
360 469
361package CFClient::Widget::Frame; 470package CFClient::UI::Frame;
362 471
363our @ISA = CFClient::Widget::Bin::; 472our @ISA = CFClient::UI::Bin::;
364 473
365use SDL::OpenGL; 474use SDL::OpenGL;
366 475
367sub size_request { 476sub size_request {
368 my ($self) = @_; 477 my ($self) = @_;
… …
375} 484}
376 485
377sub size_allocate { 486sub size_allocate {
378 my ($self, $w, $h) = @_; 487 my ($self, $w, $h) = @_;
379 488
489 return unless $self->{w} != $w || $self->{h} != $h;
490
380 $self->{w} = $w; 491 $self->{w} = $w;
381 $self->{h} = $h; 492 $self->{h} = $h;
382 493
383 $self->child->size_allocate ($w - 4, $h - 4); 494 $self->child->size_allocate ($w - 4, $h - 4);
384 $self->child->move (2, 2); 495 $self->child->move (2, 2);
… …
402 $chld->draw; 513 $chld->draw;
403} 514}
404 515
405############################################################################# 516#############################################################################
406 517
407package CFClient::Widget::FancyFrame; 518package CFClient::UI::FancyFrame;
408 519
409our @ISA = CFClient::Widget::Bin::; 520our @ISA = CFClient::UI::Bin::;
410 521
411use SDL::OpenGL; 522use SDL::OpenGL;
412 523
413my @tex = 524my @tex =
414 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 525 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
417sub size_request { 528sub size_request {
418 my ($self) = @_; 529 my ($self) = @_;
419 530
420 my ($w, $h) = $self->SUPER::size_request; 531 my ($w, $h) = $self->SUPER::size_request;
421 532
422 $h += $tex[1]->{height}; 533 $h += $tex[1]->{h};
423 $h += $tex[4]->{height}; 534 $h += $tex[4]->{h};
424 $w += $tex[2]->{width}; 535 $w += $tex[2]->{w};
425 $w += $tex[3]->{width}; 536 $w += $tex[3]->{w};
426 537
427 ($w, $h) 538 ($w, $h)
428} 539}
429 540
430sub size_allocate { 541sub size_allocate {
431 my ($self, $w, $h) = @_; 542 my ($self, $w, $h) = @_;
432 543
544 return unless $self->{w} != $w || $self->{h} != $h;
545
433 $self->SUPER::size_allocate ($w, $h); 546 $self->SUPER::size_allocate ($w, $h);
434 547
435 $h -= $tex[1]->{height}; 548 $h -= $tex[1]->{h};
436 $h -= $tex[4]->{height}; 549 $h -= $tex[4]->{h};
437 $w -= $tex[2]->{width}; 550 $w -= $tex[2]->{w};
438 $w -= $tex[3]->{width}; 551 $w -= $tex[3]->{w};
439 552
440 $h = $h < 0 ? 0 : $h; 553 $h = $h < 0 ? 0 : $h;
441 $w = $w < 0 ? 0 : $w; 554 $w = $w < 0 ? 0 : $w;
442 555
556 my $child = $self->child;
557
443 $self->child->size_allocate ($w, $h); 558 $child->size_allocate ($w, $h);
444 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 559 $child->move ($tex[3]->{w}, $tex[1]->{h});
445} 560}
446 561
447sub _draw { 562sub _draw {
448 my ($self) = @_; 563 my ($self) = @_;
449 564
450 my ($w, $h) = ($self->{w}, $self->{h}); 565 my ($w, $h) = ($self->{w}, $self->{h});
451 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 566 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
452 567
453 glEnable GL_BLEND; 568 glEnable GL_BLEND;
569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glEnable GL_TEXTURE_2D; 570 glEnable GL_TEXTURE_2D;
455 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457 572
458 my $top = $tex[1]; 573 my $top = $tex[1];
459 $top->draw_quad (0, 0, $w, $top->{height}); 574 $top->draw_quad (0, 0, $w, $top->{h});
460 575
461 my $left = $tex[3]; 576 my $left = $tex[3];
462 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 577 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
463 578
464 my $right = $tex[2]; 579 my $right = $tex[2];
465 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 580 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
466 581
467 my $bottom = $tex[4]; 582 my $bottom = $tex[4];
468 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 583 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
469 584
470 my $bg = $tex[0]; 585 my $bg = $tex[0];
471 glBindTexture GL_TEXTURE_2D, $bg->{name}; 586 glBindTexture GL_TEXTURE_2D, $bg->{name};
472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
473 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 588 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
474 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 589 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
475 590
476 my $rep_x = $cw / $bg->{width}; 591 my $rep_x = $cw / $bg->{w};
477 my $rep_y = $ch / $bg->{height}; 592 my $rep_y = $ch / $bg->{h};
478 593
479 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 594 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
480 595
481 glDisable GL_BLEND; 596 glDisable GL_BLEND;
482 glDisable GL_TEXTURE_2D; 597 glDisable GL_TEXTURE_2D;
483 598
484 $self->child->draw; 599 $self->child->draw;
485 600
486} 601}
487 602
488############################################################################# 603#############################################################################
489 604
490package CFClient::Widget::Table; 605package CFClient::UI::Table;
491 606
492our @ISA = CFClient::Widget::Bin::; 607our @ISA = CFClient::UI::Base::;
493 608
494use SDL::OpenGL; 609use SDL::OpenGL;
495 610
496sub add { 611sub add {
497 my ($self, $x, $y, $chld) = @_; 612 my ($self, $x, $y, $chld) = @_;
… …
572 } 687 }
573} 688}
574 689
575############################################################################# 690#############################################################################
576 691
577package CFClient::Widget::VBox; 692package CFClient::UI::VBox;
578 693
579our @ISA = CFClient::Widget::Container::; 694our @ISA = CFClient::UI::Container::;
580 695
581use SDL::OpenGL; 696use SDL::OpenGL;
582 697
583sub size_request { 698sub size_request {
584 my ($self) = @_; 699 my ($self) = @_;
… …
592} 707}
593 708
594sub size_allocate { 709sub size_allocate {
595 my ($self, $w, $h) = @_; 710 my ($self, $w, $h) = @_;
596 711
712 return unless $self->{w} != $w || $self->{h} != $h;
713
597 $self->w ($w); 714 $self->{w} = $w;
598 $self->h ($h); 715 $self->{h} = $h;
599 716
600 my $exp; 717 return unless $self->{h};
601 my @oth; 718
602 # find expand widget 719 my $children = $self->{children};
603 for (@{$self->{children}}) { 720
604 if ($_->{expand}) { 721 my @h = map +($_->size_request)[1], @$children;
605 $exp = $_; 722
606 last; 723 my $req_h = List::Util::sum @h;
724
725 if ($req_h > $h) {
726 # ah well, not enough space
727 $_ = $h[$_] * $h / $req_h for @h;
728 } else {
729 my @exp = grep $_->{expand}, @$children;
730 @exp = @$children unless @exp;
731
732 my %exp = map +($_ => 1), @exp;
733
734 for (0 .. $#$children) {
735 my $child = $children->[$_];
736
737 my $alloc_h = $h[$_];
738 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
739 $h[$_] = $alloc_h;
607 } 740 }
608 push @oth, $_;
609 }
610
611 my ($ow, $oh);
612
613 # get sizes of other widgets
614 for (@oth) {
615 my ($w, $h) = $_->size_request;
616 $oh += $h;
617 if ($ow < $w) { $ow = $w }
618 } 741 }
619 742
620 my $y = 0; 743 my $y = 0;
621 for (@{$self->{children}}) { 744 for (0 .. $#$children) {
745 my $child = $children->[$_];
746 my $h = $h[$_];
622 $_->move (0, $y); 747 $child->move (0, $y);
623
624 if ($_ == $exp) {
625 $_->size_allocate ($w, $h - $oh);
626 $y += $h - $oh;
627 } else {
628 my ($cw, $h) = $_->size_request;
629 $_->size_allocate ($w, $h); 748 $child->size_allocate ($w, $h);
749
630 $y += $h; 750 $y += $h;
631 }
632 } 751 }
633} 752}
634 753
635############################################################################# 754#############################################################################
636 755
637package CFClient::Widget::Label; 756package CFClient::UI::Label;
638 757
639our @ISA = CFClient::Widget::; 758our @ISA = CFClient::UI::Base::;
640 759
641use SDL::OpenGL; 760use SDL::OpenGL;
642 761
643sub new { 762sub new {
644 my ($class, %arg) = @_; 763 my ($class, %arg) = @_;
645 764
646 # TODO: color, and make height, xyz etc. optional
647 my $self = $class->SUPER::new ( 765 my $self = $class->SUPER::new (
648 color => [1, 1, 1], 766 fg => [1, 1, 1],
649 height => $::FONTSIZE, 767 height => $::FONTSIZE,
650 text => "", 768 text => "",
769 align => -1,
651 layout => new CFClient::Layout, 770 layout => new CFClient::Layout,
652 %arg 771 %arg
653 ); 772 );
654 773
655 $self->set_text ($self->{text}); 774 $self->set_text ($self->{text});
656 775
657 $self 776 $self
658} 777}
659 778
779sub escape_text {
780 local $_ = $_[1];
781
782 s/&/&amp;/g;
783 s/>/&gt;/g;
784 s/</&lt;/g;
785
786 $_[1]
787}
788
660sub set_text { 789sub set_text {
661 my ($self, $text) = @_; 790 my ($self, $text) = @_;
662 791
663 $self->{text} = $text; 792 $self->{text} = $text;
664 $self->{layout}->set_markup ($text); 793 $self->{layout}->set_markup ($text);
665 794
666 delete $self->{texture}; 795 delete $self->{texture};
796 $self->update;
667} 797}
668 798
669sub get_text { 799sub get_text {
670 my ($self, $text) = @_; 800 my ($self, $text) = @_;
671 801
… …
676 my ($self) = @_; 806 my ($self) = @_;
677 807
678 $self->{layout}->set_width; 808 $self->{layout}->set_width;
679 $self->{layout}->set_height ($self->{height}); 809 $self->{layout}->set_height ($self->{height});
680 $self->{layout}->size 810 $self->{layout}->size
681# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 811# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
682# ( 812# (
683# $self->{texture}{width}, 813# $self->{texture}{w},
684# $self->{texture}{height}, 814# $self->{texture}{h},
685# ) 815# )
686# } else { 816# } else {
687# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height}; 817# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
688# 818#
689# ($w, $h) 819# ($w, $h)
690# } 820# }
691} 821}
692 822
693sub size_allocate { 823sub size_allocate {
694 my ($self, $w, $h) = @_; 824 my ($self, $w, $h) = @_;
695 825
826 return unless $self->{w} != $w || $self->{h} != $h;
827
696 $self->SUPER::size_allocate ($w, $h); 828 $self->SUPER::size_allocate ($w, $h);
697 delete $self->{texture}; 829 delete $self->{texture};
698} 830}
699 831
832sub update {
833 my ($self) = @_;
834
835 delete $self->{texture};
836 $self->SUPER::update;
837}
838
700sub _draw { 839sub _draw {
701 my ($self) = @_; 840 my ($self) = @_;
702 841
703 my $tex = $self->{texture} ||= do { 842 my $tex = $self->{texture} ||= do {
704 $self->{layout}->set_width ($self->{w}); 843 $self->{layout}->set_width ($self->{w});
705 new_from_layout CFClient::Texture $self->{layout}; 844 new_from_layout CFClient::Texture $self->{layout}
706 }; 845 };
707 846
708 glEnable GL_BLEND; 847 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 849 glEnable GL_TEXTURE_2D;
710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 850 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
712 851
713 glColor @{$self->{color}}; 852 glColor @{$self->{fg}};
714 853
854 my $x =
855 $self->{align} < 0 ? 0
856 : $self->{align} > 0 ? $self->{w} - $tex->{w}
857 : ($self->{w} - $tex->{w}) * 0.5;
858
715 $tex->draw_quad (0, 0); 859 $tex->draw_quad ($x, 0);
716 860
861 glDisable GL_TEXTURE_2D;
717 glDisable GL_BLEND; 862 glDisable GL_BLEND;
718 glDisable GL_TEXTURE_2D; 863 glGetError and die;
719} 864}
720 865
721############################################################################# 866#############################################################################
722 867
723package CFClient::Widget::Entry; 868package CFClient::UI::Entry;
724 869
725our @ISA = CFClient::Widget::Label::; 870our @ISA = CFClient::UI::Label::;
726 871
727use SDL; 872use SDL;
728use SDL::OpenGL; 873use SDL::OpenGL;
729 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 fg => [1, 1, 1],
880 bg => [0, 0, 0, 0.4],
881 active_bg => [1, 1, 1],
882 active_fg => [0, 0, 0],
883 @_
884 )
885}
886
887sub _set_text {
888 my ($self, $text) = @_;
889
890 $self->{last_activity} = $::NOW;
891
892 $self->{text} = $text;
893 $self->{layout}->set_width ($self->{w});
894
895 $text =~ s/./*/g if $self->{hidden};
896
897
898 $self->{layout}->set_markup ($self->escape_text ($text));
899
900 $text = substr $text, 0, $self->{cursor};
901 utf8::encode $text;
902
903 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
904}
905
906sub size_request {
907 my ($self) = @_;
908
909 my ($w, $h) = $self->SUPER::size_request;
910
911 ($w + 1, $h) # add 1 for cursor
912}
913
914sub size_allocate {
915 my ($self, $w, $h) = @_;
916
917 return unless $self->{w} != $w || $self->{h} != $h;
918
919 $self->SUPER::size_allocate ($w, $h);
920
921 $self->_set_text ($self->{text});
922}
923
924sub set_text {
925 my ($self, $text) = @_;
926
927 $self->{cursor} = length $text;
928 $self->_set_text ($text);
929 $self->update;
930}
931
730sub key_down { 932sub key_down {
731 my ($self, $ev) = @_; 933 my ($self, $ev) = @_;
732 934
733 my $mod = $ev->key_mod; 935 my $mod = $ev->key_mod;
734 my $sym = $ev->key_sym; 936 my $sym = $ev->key_sym;
… …
736 my $uni = $ev->key_unicode; 938 my $uni = $ev->key_unicode;
737 939
738 my $text = $self->get_text; 940 my $text = $self->get_text;
739 941
740 if ($sym == SDLK_BACKSPACE) { 942 if ($sym == SDLK_BACKSPACE) {
741 substr $text, -1, 1, ''; 943 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
944 } elsif ($sym == SDLK_DELETE) {
945 substr $text, $self->{cursor}, 1, "";
946 } elsif ($sym == SDLK_LEFT) {
947 --$self->{cursor} if $self->{cursor};
948 } elsif ($sym == SDLK_RIGHT) {
949 ++$self->{cursor} if $self->{cursor} < length $self->{text};
742 } elsif ($uni) { 950 } elsif ($uni) {
743 $text .= chr $uni; 951 substr $text, $self->{cursor}++, 0, chr $uni;
744 } 952 }
745 953
746 $self->set_text ($text); 954 $self->_set_text ($text);
955 $self->update;
956}
957
958sub focus_in {
959 my ($self) = @_;
960
961 $self->{last_activity} = $::NOW;
962
963 $self->SUPER::focus_in;
747} 964}
748 965
749sub button_down { 966sub button_down {
750 my ($self, $ev) = @_; 967 my ($self, $ev, $x, $y) = @_;
751 968
752 $self->focus_in; 969 $self->SUPER::button_down ($ev, $x, $y);
970
971 my $idx = $self->{layout}->xy_to_index ($x, $y);
972
973 # byte-index to char-index
974 my $text = $self->{layout};
975 utf8::encode $text;
976 $self->{cursor} = length substr $text, 0, $idx;
977
978 $self->_set_text ($self->{text});
979 $self->update;
753} 980}
754 981
755sub mouse_motion { 982sub mouse_motion {
756 my ($self, $ev, $x, $y) = @_; 983 my ($self, $ev, $x, $y) = @_;
757 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 984# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
758} 985}
759 986
760sub _draw { 987sub _draw {
761 my ($self) = @_; 988 my ($self) = @_;
762 989
990 local $self->{fg} = $self->{fg};
991
763 if ($FOCUS == $self) { 992 if ($FOCUS == $self) {
764 glColor 1, 1, 1; 993 glColor @{$self->{active_bg}};
994 $self->{fg} = $self->{active_fg};
765 } else { 995 } else {
766 glColor 0.7, 0.7, 0.7; 996 glColor @{$self->{bg}};
767 } 997 }
768 998
769 glBegin GL_QUADS; 999 glBegin GL_QUADS;
770 glVertex 0 , 0; 1000 glVertex 0 , 0;
771 glVertex 0 , $self->{h} - 1; 1001 glVertex 0 , $self->{h};
772 glVertex $self->{w} - 1, $self->{h} - 1; 1002 glVertex $self->{w}, $self->{h};
773 glVertex $self->{w} - 1, 0; 1003 glVertex $self->{w}, 0;
774 glEnd; 1004 glEnd;
775 1005
776 $self->SUPER::_draw; 1006 $self->SUPER::_draw;
777}
778 1007
779############################################################################# 1008 #TODO: force update every cursor change :(
1009 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1010 glColor @{$self->{fg}};
1011 glBegin GL_LINES;
1012 glVertex $self->{cur_x}, $self->{cur_y};
1013 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1014 glEnd;
1015 }
1016}
780 1017
1018#############################################################################
1019
1020package CFClient::UI::Slider;
1021
1022use strict;
1023
1024use SDL::OpenGL;
1025
1026our @ISA = CFClient::UI::DrawBG::;
1027
1028sub size_request {
1029 my ($self) = @_;
1030
1031 my $w = 50;
1032 my $h = 10;
1033
1034 $self->{vertical} ? ($h, $w) : ($w, $h)
1035}
1036
1037sub new {
1038 my $class = shift;
1039
1040 # range [value, low, high, page]
1041
1042 $class->SUPER::new (
1043 fg => [1, 1, 1],
1044 active_fg => [0, 0, 0],
1045 range => [0, 0, 100, 10],
1046 vertical => 1,
1047 @_
1048 )
1049}
1050
1051sub button_down {
1052 my ($self, $ev, $x, $y) = @_;
1053
1054 $self->SUPER::button_down ($ev, $x, $y);
1055 $self->mouse_motion ($ev, $x, $y);
1056}
1057
1058sub mouse_motion {
1059 my ($self, $ev, $x, $y) = @_;
1060
1061 if ($GRAB == $self) {
1062 my ($value, $lo, $hi, $page) = @{$self->{range}};
1063
1064 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1065
1066 $x = $x * ($hi - $lo) / $w + $lo;
1067 $x = $lo if $x < $lo;
1068 $x = $hi - $page if $x > $hi - $page;
1069 $self->{range}[0] = $x;
1070
1071 $self->emit (changed => $x);
1072 $self->update;
1073 }
1074}
1075
1076sub _draw {
1077 my ($self) = @_;
1078
1079 $self->SUPER::_draw ();
1080
1081 my ($w, $h) = @$self{qw(w h)};
1082
1083 if ($self->{vertical}) {
1084 # draw a vertical slider like a rotated horizontal slider
1085
1086 glRotate 90, 0, 0, 1;
1087 glTranslate 0, -$self->{w}, 0;
1088
1089 ($w, $h) = ($h, $w);
1090 }
1091
1092 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1093 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1094
1095 my ($value, $lo, $hi, $page) = @{$self->{range}};
1096
1097 $page = int $page * $w / ($hi - $lo);
1098 $value = int +($value - $lo) * $w / ($hi - $lo);
1099
1100 $w -= $page;
1101 $page &= ~1;
1102 glTranslate $page * 0.5, 0, 0;
1103
1104 glColor @$fg;
1105 glBegin GL_LINES;
1106 glVertex 0, 0; glVertex 0, $h;
1107 glVertex $w - 1, 0; glVertex $w - 1, $h;
1108 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1109 glEnd;
1110
1111 my $knob_a = $value - $page * 0.5;
1112 my $knob_b = $value + $page * 0.5;
1113
1114 glBegin GL_QUADS;
1115 glColor @$fg;
1116 glVertex $knob_a, 0;
1117 glVertex $knob_a, $h;
1118 glVertex $knob_b, $h;
1119 glVertex $knob_b, 0;
1120
1121 if ($knob_a < $knob_b - 2) {
1122 glColor @$bg;
1123 glVertex $knob_a + 1, 1;
1124 glVertex $knob_a + 1, $h - 1;
1125 glVertex $knob_b - 1, $h - 1;
1126 glVertex $knob_b - 1, 1;
1127 }
1128 glEnd;
1129}
1130
1131#############################################################################
1132
781package CFClient::Widget::MapWidget; 1133package CFClient::UI::MapWidget;
782 1134
783use strict; 1135use strict;
784 1136
785use List::Util qw(min max); 1137use List::Util qw(min max);
786 1138
787use SDL; 1139use SDL;
788use SDL::OpenGL; 1140use SDL::OpenGL;
789use SDL::OpenGL::Constants;
790 1141
791our @ISA = CFClient::Widget::; 1142our @ISA = CFClient::UI::Base::;
792 1143
793sub new { 1144sub new {
794 my $class = shift; 1145 my $class = shift;
795 1146
796 $class->SUPER::new ( 1147 $class->SUPER::new (
… …
816 1167
817sub update { 1168sub update {
818 my ($self) = @_; 1169 my ($self) = @_;
819 1170
820 $self->{need_update} = 1; 1171 $self->{need_update} = 1;
1172 $self->SUPER::update;
821} 1173}
822 1174
823sub _draw { 1175sub _draw {
824 my ($self) = @_; 1176 my ($self) = @_;
825 1177
… …
848 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1200 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
849 } 1201 }
850 1202
851 glEnable GL_TEXTURE_2D; 1203 glEnable GL_TEXTURE_2D;
852 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
854 1207
855 my $sw4 = ($sw + 3) & ~3; 1208 my $sw4 = ($sw + 3) & ~3;
856 my $darkness = "\x00" x ($sw4 * $sh); 1209 my $darkness = "\x00" x ($sw4 * $sh);
857 1210
… …
870 } 1223 }
871 1224
872 for my $num (grep $_, @$cell[1,2,3]) { 1225 for my $num (grep $_, @$cell[1,2,3]) {
873 my $tex = $::CONN->{face}[$num]{texture} || next; 1226 my $tex = $::CONN->{face}[$num]{texture} || next;
874 1227
875 my $w = $tex->{width}; 1228 my ($w, $h) = @$tex{qw(w h)};
876 my $h = $tex->{height};
877 1229
878 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1230 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
879 } 1231 }
880 } 1232 }
881 } 1233 }
… …
888# 1240#
889# $lighting = $pb->get_pixels; 1241# $lighting = $pb->get_pixels;
890# $lighting =~ s/(.)../$1/gs; 1242# $lighting =~ s/(.)../$1/gs;
891# } 1243# }
892 1244
893 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
895 1246
896 $darkness = new CFClient::Texture 1247 $darkness = new CFClient::Texture
897 width => $sw4, 1248 w => $sw4,
898 height => $sh, 1249 h => $sh,
899 data => $darkness, 1250 data => $darkness,
900 internalformat => GL_ALPHA, 1251 internalformat => GL_ALPHA,
901 format => GL_ALPHA; 1252 format => GL_ALPHA;
902 1253
903 glColor 0.45, 0.45, 0.45, 1; 1254 glColor 0.45, 0.45, 0.45, 1;
… …
963 } 1314 }
964} 1315}
965 1316
966############################################################################# 1317#############################################################################
967 1318
968package CFClient::Widget::Animator; 1319package CFClient::UI::Animator;
969 1320
970use SDL::OpenGL; 1321use SDL::OpenGL;
971 1322
972our @ISA = CFClient::Widget::Bin::; 1323our @ISA = CFClient::UI::Bin::;
973 1324
974sub moveto { 1325sub moveto {
975 my ($self, $x, $y) = @_; 1326 my ($self, $x, $y) = @_;
976 1327
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1328 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1005 glPopMatrix; 1356 glPopMatrix;
1006} 1357}
1007 1358
1008############################################################################# 1359#############################################################################
1009 1360
1010package CFClient::Widget::Toplevel; 1361package CFClient::UI::Toplevel;
1011 1362
1012our @ISA = CFClient::Widget::Container::; 1363our @ISA = CFClient::UI::Container::;
1013 1364
1014sub size_request { 1365sub size_request {
1015 ($::WIDTH, $::HEIGHT) 1366 ($::WIDTH, $::HEIGHT)
1016} 1367}
1017 1368
… …
1051 $self->_draw; 1402 $self->_draw;
1052} 1403}
1053 1404
1054############################################################################# 1405#############################################################################
1055 1406
1056package CFClient::Widget; 1407package CFClient::UI;
1057 1408
1058$TOPLEVEL = new CFClient::Widget::Toplevel; 1409$TOPLEVEL = new CFClient::UI::Toplevel;
1059 1410
10601 14111
1061 1412

Diff Legend

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