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.123 by root, Mon Apr 17 19:50:22 2006 UTC vs.
Revision 1.163 by root, Mon Apr 24 06:40:29 2006 UTC

8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
27 56
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
33 }
34 62
63 check_tooltip;
64 }
65
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
60 99
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 101
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
87 131
88package CFClient::UI::Base; 132package CFClient::UI::Base;
89 133
90use strict; 134use strict;
91 135
92use SDL::OpenGL; 136use CFClient::OpenGL;
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
101 w => -1, 145 can_events => 1,
102 h => -1,
103 @_ 146 @_
104 }, $class; 147 }, $class;
105 148
106 for (keys %$self) { 149 for (keys %$self) {
107 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
110 } 153 }
111 154
112 $self 155 $self
113} 156}
114 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
165sub show {
166 my ($self) = @_;
167
168 return if $self->{parent};
169
170 $CFClient::UI::ROOT->add ($self);
171}
172
173sub hide {
174 my ($self) = @_;
175
176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
178
179 $self->{parent}->remove ($self)
180 if $self->{parent};
181}
182
115sub move { 183sub move {
116 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
185
117 $self->{x} = int $x; 186 $self->{x} = int $x;
118 $self->{y} = int $y; 187 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
120}
121 189
122sub needs_redraw { 190 $self->update;
123 0 191}
192
193sub set_size {
194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
124} 200}
125 201
126sub size_request { 202sub size_request {
127 require Carp; 203 require Carp;
128 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
129} 205}
130 206
131sub _size_allocate { 207sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
133 209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 223 $self->{x} = $x;
135 $self->{y} = $y; 224 $self->{y} = $y;
225 $self->update;
226 }
136 227
137 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
138
139 $self->{w} = $w; 229 $self->{w} = $w;
140 $self->{h} = $h; 230 $self->{h} = $h;
141 231
232 $self->size_allocate ($w, $h);
233 $self->update;
142 1 234 }
143} 235}
144 236
145sub size_allocate { 237sub size_allocate {
238 # nothing to be done
239}
240
241sub set_max_size {
146 my ($self, $x, $y, $w, $h) = @_; 242 my ($self, $w, $h) = @_;
147 243
148 $self->_size_allocate ($x, $y, $w, $h); 244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
149} 246}
150 247
151# return top left coordinates 248# return top left coordinates
152sub _topleft { 249sub _topleft {
153 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
236 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
237 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
238 glEnd; 335 glEnd;
239 glDisable GL_BLEND; 336 glDisable GL_BLEND;
240 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
241} 352}
242 353
243sub _draw { 354sub _draw {
244 my ($self) = @_; 355 my ($self) = @_;
245 356
246 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
247} 358}
248 359
249sub find_widget { 360sub find_widget {
250 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
251 364
252 return $self 365 return $self
253 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
255 368
260 my ($self, $parent) = @_; 373 my ($self, $parent) = @_;
261 374
262 Scalar::Util::weaken ($self->{parent} = $parent); 375 Scalar::Util::weaken ($self->{parent} = $parent);
263} 376}
264 377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
265sub update { 404sub update {
266 my ($self) = @_; 405 my ($self) = @_;
267 406
268 $self->{parent}->update 407 $self->{parent}->update
269 if $self->{parent}; 408 if $self->{parent};
270} 409}
271 410
272sub connect { 411sub connect {
273 my ($self, $signal, $cb) = @_; 412 my ($self, $signal, $cb) = @_;
274 413
275 push @{ $self->{cb}{$signal} }, $cb; 414 push @{ $self->{signal_cb}{$signal} }, $cb;
276} 415}
277 416
278sub emit { 417sub emit {
279 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
280 419
281 $_->($self, @args) 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
282 for @{$self->{cb}{$signal} || []};
283} 421}
284 422
285sub DESTROY { 423sub DESTROY {
286 my ($self) = @_; 424 my ($self) = @_;
287 425
293package CFClient::UI::DrawBG; 431package CFClient::UI::DrawBG;
294 432
295our @ISA = CFClient::UI::Base::; 433our @ISA = CFClient::UI::Base::;
296 434
297use strict; 435use strict;
298use SDL::OpenGL; 436use CFClient::OpenGL;
299 437
300sub new { 438sub new {
301 my $class = shift; 439 my $class = shift;
302 440
303 # range [value, low, high, page] 441 # range [value, low, high, page]
332 470
333package CFClient::UI::Empty; 471package CFClient::UI::Empty;
334 472
335our @ISA = CFClient::UI::Base::; 473our @ISA = CFClient::UI::Base::;
336 474
475sub new {
476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
479
337sub size_request { 480sub size_request {
338 (0, 0) 481 (0, 0)
339} 482}
340 483
341sub draw { } 484sub draw { }
349sub new { 492sub new {
350 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
351 494
352 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
353 496
354 my $self = $class->SUPER::new (children => [], %arg); 497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
355 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
356 499
357 $self 500 $self
358} 501}
359 502
367 $self->{children} = [ 510 $self->{children} = [
368 sort { $a->{z} <=> $b->{z} } 511 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 512 @{$self->{children}}, $child
370 ]; 513 ];
371 514
372 $self->{w} = $self->{h} = -1; 515 $child->check_size;
516}
517
518sub remove {
519 my ($self, $child) = @_;
520
521 delete $child->{parent};
522 $child->hide;
523
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
525
526 $self->check_size;
373 $self->update; 527 $self->update;
374} 528}
375 529
376sub remove { 530sub clear {
377 my ($self, $widget) = @_; 531 my ($self) = @_;
378 532
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 533 my $children = delete $self->{children};
534 $self->{children} = [];
380 535
381 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 536 for (@$children) {
537 delete $_->{parent};
538 $_->hide;
539 }
382} 540}
383 541
384sub find_widget { 542sub find_widget {
385 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
386 544
416 574
417 $class->SUPER::new (children => [$child], %arg) 575 $class->SUPER::new (children => [$child], %arg)
418} 576}
419 577
420sub add { 578sub add {
421 my ($self, $widget) = @_; 579 my ($self, $child) = @_;
422 580
423 $self->{children} = []; 581 $self->{children} = [];
424 582
425 $self->SUPER::add ($widget); 583 $self->SUPER::add ($child);
426} 584}
427 585
428sub remove { 586sub remove {
429 my ($self, $widget) = @_; 587 my ($self, $widget) = @_;
430 588
439sub size_request { 597sub size_request {
440 $_[0]{children}[0]->size_request 598 $_[0]{children}[0]->size_request
441} 599}
442 600
443sub size_allocate { 601sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 602 my ($self, $w, $h) = @_;
445 603
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 604 $self->{children}[0]->configure (0, 0, $w, $h);
449} 605}
450 606
451############################################################################# 607#############################################################################
452 608
453package CFClient::UI::Window; 609package CFClient::UI::Window;
454 610
455our @ISA = CFClient::UI::Bin::; 611our @ISA = CFClient::UI::Bin::;
456 612
457use SDL::OpenGL; 613use CFClient::OpenGL;
458 614
459sub new { 615sub new {
460 my ($class, %arg) = @_; 616 my ($class, %arg) = @_;
461 617
462 my $self = $class->SUPER::new (%arg); 618 my $self = $class->SUPER::new (%arg);
479 $self->child->draw; 635 $self->child->draw;
480 }; 636 };
481} 637}
482 638
483sub size_allocate { 639sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_; 640 my ($self, $w, $h) = @_;
485 641
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h); 642 $self->child->configure (0, 0, $w, $h);
489 643
490 $self->render_chld; 644 $self->render_chld;
491} 645}
492 646
493sub _draw { 647sub _draw {
509 glDisable GL_TEXTURE_2D; 663 glDisable GL_TEXTURE_2D;
510} 664}
511 665
512############################################################################# 666#############################################################################
513 667
668package CFClient::UI::ViewPort;
669
670our @ISA = CFClient::UI::Window::;
671
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
514package CFClient::UI::Frame; 692package CFClient::UI::Frame;
515 693
516our @ISA = CFClient::UI::Bin::; 694our @ISA = CFClient::UI::Bin::;
517 695
518use SDL::OpenGL; 696use CFClient::OpenGL;
519
520sub size_request {
521 my ($self) = @_;
522 my $chld = $self->child
523 or return (0, 0);
524
525 $chld->move (2, 2);
526
527 map { $_ + 4 } $chld->size_request;
528}
529
530sub size_allocate {
531 my ($self, $x, $y, $w, $h) = @_;
532
533 $self->_size_allocate ($x, $y, $w, $h) or return;
534
535 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
536}
537
538sub _draw {
539 my ($self) = @_;
540
541 my $chld = $self->child;
542
543 my ($w, $h) = $chld->size_request;
544
545 glBegin GL_QUADS;
546 glColor 0, 0, 0;
547 glVertex 0 , 0;
548 glVertex 0 , $h + 4;
549 glVertex $w + 4 , $h + 4;
550 glVertex $w + 4 , 0;
551 glEnd;
552
553 $chld->draw;
554}
555
556#############################################################################
557
558package CFClient::UI::FancyFrame;
559
560our @ISA = CFClient::UI::Bin::;
561
562use SDL::OpenGL;
563
564my @tex =
565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567 697
568sub new { 698sub new {
569 my $class = shift; 699 my $class = shift;
570 700
571 # TODO: user_x, user_y, overwrite moveto?
572
573 $class->SUPER::new ( 701 my $self = $class->SUPER::new (
574 bg => [1, 1, 1, 1], 702 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1], 703 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8, 704 border => 0.8,
577 @_ 705 @_
706 );
707
708 $self
709}
710
711sub _draw {
712 my ($self) = @_;
713
714 my ($w, $h) = ($self->{w}, $self->{h});
715
716 glEnable GL_BLEND;
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720
721# glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733}
734
735#############################################################################
736
737package CFClient::UI::FancyFrame;
738
739our @ISA = CFClient::UI::Bin::;
740
741use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746
747sub new {
748 my $class = shift;
749
750 # TODO: user_x, user_y, overwrite moveto?
751
752 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1],
755 border => 0.8,
756 can_events => 1,
757 @_
758 );
759
760 $self->{title} &&= new CFClient::UI::Label
761 align => 0,
762 valign => 1,
763 text => $self->{title},
764 fontsize => 1;
765
766 $self
767}
768
769sub border {
770 int $_[0]{border} * $::FONTSIZE
771}
772
773sub size_request {
774 my ($self) = @_;
775
776 my ($w, $h) = $self->SUPER::size_request;
777
778 (
779 $w + $self->border * 2,
780 $h + $self->border * 2,
578 ) 781 )
579} 782}
580 783
581sub size_request {
582 my ($self) = @_;
583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586 my ($w, $h) = $self->SUPER::size_request;
587
588 (
589 $w + $self->{border} * 2,
590 $h + $self->{border} * 2,
591 )
592}
593
594sub size_allocate { 784sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 785 my ($self, $w, $h) = @_;
596 786
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598
599 $h -= List::Util::max 0, $self->{border} * 2; 787 $h -= List::Util::max 0, $self->border * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 788 $w -= List::Util::max 0, $self->border * 2;
601 789
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
791 if $self->{title};
792
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 793 $self->child->configure ($self->border, $self->border, $w, $h);
603} 794}
604 795
605sub button_down { 796sub button_down {
606 my ($self, $ev, $x, $y) = @_; 797 my ($self, $ev, $x, $y) = @_;
607 798
799 my $border = $self->border;
800
608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 801 if ($x < $self->{w} && $x >= $self->{w} - $border
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 802 && $y < $self->{h} && $y >= $self->{h} - $border) {
610 803
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 804 my ($ox, $oy) = ($ev->{x}, $ev->{y});
612 my ($bw, $bh) = ($self->{w}, $self->{h}); 805 my ($bw, $bh) = ($self->{w}, $self->{h});
613 806
614 $self->{motion} = sub { 807 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_; 808 my ($ev, $x, $y) = @_;
616 809
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 810 ($x, $y) = ($ev->{x}, $ev->{y});
618 811
619 $self->{user_w} = $bw + $x - $ox; 812 $self->{user_w} = $bw + $x - $ox;
620 $self->{user_h} = $bh + $y - $oy; 813 $self->{user_h} = $bh + $y - $oy;
621 $self->update; 814 $self->check_size;
622 }; 815 };
623 816
624 } elsif ($x >= 0 && $x < $self->{w} 817 } elsif ($x >= 0 && $x < $self->{w}
625 && $y >= 0 && $y < $self->{border}) { 818 && $y >= 0 && $y < $border) {
626 819
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 820 my ($ox, $oy) = ($ev->{x}, $ev->{y});
628 my ($bx, $by) = ($self->{x}, $self->{y}); 821 my ($bx, $by) = ($self->{x}, $self->{y});
629 822
630 $self->{motion} = sub { 823 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_; 824 my ($ev, $x, $y) = @_;
632 825
633 ($x, $y) = ($ev->motion_x, $ev->motion_y); 826 ($x, $y) = ($ev->{x}, $ev->{y});
634 827
635 $self->move ($bx + $x - $ox, $by + $y - $oy); 828 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update; 829 $self->update;
637 }; 830 };
638 } 831 }
659 glEnable GL_BLEND; 852 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 854 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663 856
857 my $border = $self->border;
858
664 glColor @{ $self->{border_bg} }; 859 glColor @{ $self->{border_bg} };
665 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 860 $tex[1]->draw_quad (0, 0, $w, $border);
666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 861 $tex[3]->draw_quad (0, $border, $border, $ch);
667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 863 $tex[4]->draw_quad (0, $h - $border, $w, $border);
669 864
670 my $bg = $tex[0]; 865 my $bg = $tex[0];
671 866
672 # TODO: repeat texture not scale 867 # TODO: repeat texture not scale
673 my $rep_x = $cw / $bg->{w}; 868 my $rep_x = $cw / $bg->{w};
676 glColor @{ $self->{bg} }; 871 glColor @{ $self->{bg} };
677 872
678 $bg->{s} = $rep_x; 873 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y; 874 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1; 875 $bg->{wrap_mode} = 1;
681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 876 $bg->draw_quad ($border, $border, $cw, $ch);
682 877
683 glDisable GL_TEXTURE_2D; 878 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 879 glDisable GL_BLEND;
685 880
881 $self->{title}->draw if $self->{title};
686 $self->child->draw; 882 $self->child->draw;
687} 883}
688 884
689############################################################################# 885#############################################################################
690 886
692 888
693our @ISA = CFClient::UI::Base::; 889our @ISA = CFClient::UI::Base::;
694 890
695use List::Util qw(max sum); 891use List::Util qw(max sum);
696 892
697use SDL::OpenGL; 893use CFClient::OpenGL;
698 894
699sub new { 895sub new {
700 my $class = shift; 896 my $class = shift;
701 897
702 $class->SUPER::new ( 898 $class->SUPER::new (
709 my ($self, $x, $y, $child) = @_; 905 my ($self, $x, $y, $child) = @_;
710 906
711 $child->set_parent ($self); 907 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 908 $self->{children}[$y][$x] = $child;
713 909
714 $self->{w} = $self->{h} = -1; 910 $child->check_size;
715 $self->update;
716} 911}
717 912
718# TODO: move to container class maybe? send childs a signal on removal? 913# TODO: move to container class maybe? send childs a signal on removal?
719sub clear { 914sub clear {
720 my ($self) = @_; 915 my ($self) = @_;
721 916
722 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
723 $self->update; 924 $self->update;
724} 925}
725 926
726sub get_wh { 927sub get_wh {
727 my ($self) = @_; 928 my ($self) = @_;
733 or next; 934 or next;
734 935
735 for my $x (0 .. $#$row) { 936 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x] 937 my $widget = $row->[$x]
737 or next; 938 or next;
738 my ($w, $h) = $widget->size_request; 939 my ($w, $h) = @$widget{qw(req_w req_h)};
739 940
740 $w[$x] = max $w[$x], $w; 941 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h; 942 $h[$y] = max $h[$y], $h;
742 } 943 }
743 } 944 }
755 (sum @$hs), 956 (sum @$hs),
756 ) 957 )
757} 958}
758 959
759sub size_allocate { 960sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 961 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 962
764 my ($ws, $hs) = $self->get_wh; 963 my ($ws, $hs) = $self->get_wh;
765 964
766 my $req_w = sum @$ws; 965 my $req_w = sum @$ws;
767 my $req_h = sum @$hs; 966 my $req_h = sum @$hs;
789 988
790 for my $c (0 .. $#$row) { 989 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 990 my $col_w = $ws->[$c];
792 991
793 if (my $widget = $row->[$c]) { 992 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 993 $widget->configure ($x, $y, $col_w, $row_h);
795 } 994 }
796 995
797 $x += $col_w; 996 $x += $col_w;
798 } 997 }
799 998
844 (List::Util::max map $_->[1], @alloc), 1043 (List::Util::max map $_->[1], @alloc),
845 ) 1044 )
846} 1045}
847 1046
848sub size_allocate { 1047sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_; 1048 my ($self, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852 1049
853 ($h, $w) = ($w, $h); 1050 ($h, $w) = ($w, $h);
854 1051
855 my $children = $self->{children}; 1052 my $children = $self->{children};
856 1053
857 my @h = map +($_->size_request)[0], @$children; 1054 my @h = map $_->{req_w}, @$children;
858 1055
859 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
860 1057
861 if ($req_h > $h) { 1058 if ($req_h > $h) {
862 # ah well, not enough space 1059 # ah well, not enough space
878 1075
879 my $y = 0; 1076 my $y = 0;
880 for (0 .. $#$children) { 1077 for (0 .. $#$children) {
881 my $child = $children->[$_]; 1078 my $child = $children->[$_];
882 my $h = $h[$_]; 1079 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w); 1080 $child->configure ($y, 0, $h, $w);
884 1081
885 $y += $h; 1082 $y += $h;
886 } 1083 }
1084
1085 1
887} 1086}
888 1087
889############################################################################# 1088#############################################################################
890 1089
891package CFClient::UI::VBox; 1090package CFClient::UI::VBox;
904 (List::Util::sum map $_->[1], @alloc), 1103 (List::Util::sum map $_->[1], @alloc),
905 ) 1104 )
906} 1105}
907 1106
908sub size_allocate { 1107sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_; 1108 my ($self, $w, $h) = @_;
910
911 $self->_size_allocate ($x, $y, $w, $h);
912 1109
913 my $children = $self->{children}; 1110 my $children = $self->{children};
914 1111
915 my @h = map +($_->size_request)[1], @$children; 1112 my @h = map $_->{req_h}, @$children;
916 1113
917 my $req_h = List::Util::sum @h; 1114 my $req_h = List::Util::sum @h;
918 1115
919 if ($req_h > $h) { 1116 if ($req_h > $h) {
920 # ah well, not enough space 1117 # ah well, not enough space
934 1131
935 my $y = 0; 1132 my $y = 0;
936 for (0 .. $#$children) { 1133 for (0 .. $#$children) {
937 my $child = $children->[$_]; 1134 my $child = $children->[$_];
938 my $h = $h[$_]; 1135 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h); 1136 $child->configure (0, $y, $w, $h);
940 1137
941 $y += $h; 1138 $y += $h;
942 } 1139 }
1140
1141 1
943} 1142}
944 1143
945############################################################################# 1144#############################################################################
946 1145
947package CFClient::UI::Label; 1146package CFClient::UI::Label;
948 1147
949our @ISA = CFClient::UI::Base::; 1148our @ISA = CFClient::UI::Base::;
950 1149
951use SDL::OpenGL; 1150use CFClient::OpenGL;
952 1151
953sub new { 1152sub new {
954 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
955 1154
956 my $self = $class->SUPER::new ( 1155 my $self = $class->SUPER::new (
957 fg => [1, 1, 1], 1156 fg => [1, 1, 1],
1157 #font => default_font
958 fontsize => $::FONTSIZE, 1158 fontsize => 1,
959 text => "", 1159 text => "",
960 align => -1, 1160 align => -1,
961 valign => -1, 1161 valign => -1,
962 padding => 2, 1162 padding => 2,
963 layout => new CFClient::Layout, 1163 layout => new CFClient::Layout,
1164 can_events => 0,
964 %arg 1165 %arg
965 ); 1166 );
966 1167
967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1168 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout;
1172 }
968 1173
969 $self->set_text (delete $self->{text}) if exists $self->{text}; 1174 $self->set_text (delete $self->{text}) if exists $self->{text};
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
971 1176
972 $self 1177 $self
973} 1178}
974 1179
975sub escape_text { 1180sub escape {
976 local $_ = $_[1]; 1181 local $_ = $_[1];
977 1182
978 s/&/&amp;/g; 1183 s/&/&amp;/g;
979 s/>/&gt;/g; 1184 s/>/&gt;/g;
980 s/</&lt;/g; 1185 s/</&lt;/g;
986 my ($self, $text) = @_; 1191 my ($self, $text) = @_;
987 1192
988 $self->{layout}->set_text ($text); 1193 $self->{layout}->set_text ($text);
989 1194
990 delete $self->{texture}; 1195 delete $self->{texture};
1196 $self->check_size;
991 $self->update; 1197 $self->update;
992} 1198}
993 1199
994sub set_markup { 1200sub set_markup {
995 my ($self, $markup) = @_; 1201 my ($self, $markup) = @_;
996 1202
997 $self->{layout}->set_markup ($markup); 1203 $self->{layout}->set_markup ($markup);
998 1204
999 delete $self->{texture}; 1205 delete $self->{texture};
1206 $self->check_size;
1000 $self->update; 1207 $self->update;
1001} 1208}
1002 1209
1003sub size_request { 1210sub size_request {
1004 my ($self) = @_; 1211 my ($self) = @_;
1005 1212
1006 $self->{layout}->set_width; 1213 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1);
1007 $self->{layout}->set_height ($self->{fontsize}); 1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1008 1216
1009 my ($w, $h) = $self->{layout}->size; 1217 my ($w, $h) = $self->{layout}->size;
1218
1219 if (exists $self->{template}) {
1220 $self->{template}->set_font ($self->{font}) if $self->{font};
1221 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1222
1223 my ($w2, $h2) = $self->{template}->size;
1224
1225 $w = List::Util::max $w, $w2;
1226 $h = List::Util::max $h, $h2;
1227 }
1010 1228
1011 ( 1229 (
1012 $w + $self->{padding} * 2, 1230 $w + $self->{padding} * 2,
1013 $h + $self->{padding} * 2, 1231 $h + $self->{padding} * 2,
1014 ) 1232 )
1015} 1233}
1016 1234
1017sub size_allocate { 1235sub size_allocate {
1018 my ($self, $x, $y, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1019
1020 $self->_size_allocate ($x, $y, $w, $h) or return;
1021 1237
1022 delete $self->{texture}; 1238 delete $self->{texture};
1023} 1239}
1024 1240
1025sub update { 1241sub set_fontsize {
1026 my ($self) = @_; 1242 my ($self, $fontsize) = @_;
1027 1243
1244 $self->{fontsize} = $fontsize;
1028 delete $self->{texture}; 1245 delete $self->{texture};
1246 $self->check_size;
1029 $self->SUPER::update; 1247 $self->update;
1030} 1248}
1031 1249
1032sub _draw { 1250sub _draw {
1033 my ($self) = @_; 1251 my ($self) = @_;
1034 1252
1035 my $tex = $self->{texture} ||= do { 1253 my $tex = $self->{texture} ||= do {
1254 $self->{layout}->set_font ($self->{font}) if $self->{font};
1036 $self->{layout}->set_width ($self->{w}); 1255 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1038 new_from_layout CFClient::Texture $self->{layout} 1257 new_from_layout CFClient::Texture $self->{layout}
1039 }; 1258 };
1040 1259
1041 glEnable GL_BLEND; 1260 glEnable GL_BLEND;
1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1067 1286
1068package CFClient::UI::EntryBase; 1287package CFClient::UI::EntryBase;
1069 1288
1070our @ISA = CFClient::UI::Label::; 1289our @ISA = CFClient::UI::Label::;
1071 1290
1072use SDL; 1291use CFClient::OpenGL;
1073use SDL::OpenGL;
1074 1292
1075sub new { 1293sub new {
1076 my $class = shift; 1294 my $class = shift;
1077 1295
1078 $class->SUPER::new ( 1296 $class->SUPER::new (
1081 active_bg => [1, 1, 1, 0.5], 1299 active_bg => [1, 1, 1, 0.5],
1082 active_fg => [0, 0, 0], 1300 active_fg => [0, 0, 0],
1083 can_hover => 1, 1301 can_hover => 1,
1084 can_focus => 1, 1302 can_focus => 1,
1085 valign => 0, 1303 valign => 0,
1304 can_events => 1,
1086 @_ 1305 @_
1087 ) 1306 )
1088} 1307}
1089 1308
1090sub _set_text { 1309sub _set_text {
1092 1311
1093 delete $self->{cur_h}; 1312 delete $self->{cur_h};
1094 1313
1095 return if $self->{text} eq $text; 1314 return if $self->{text} eq $text;
1096 1315
1316 delete $self->{texture};
1317
1097 $self->{last_activity} = $::NOW; 1318 $self->{last_activity} = $::NOW;
1098 $self->{text} = $text; 1319 $self->{text} = $text;
1099 1320
1100 $text =~ s/./*/g if $self->{hidden}; 1321 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text "); 1322 $self->{layout}->set_text ("$text ");
1114 1335
1115 ($w + 1, $h) # add 1 for cursor 1336 ($w + 1, $h) # add 1 for cursor
1116} 1337}
1117 1338
1118sub size_allocate { 1339sub size_allocate {
1119 my ($self, $x, $y, $w, $h) = @_; 1340 my ($self, $w, $h) = @_;
1120 1341
1121 $self->SUPER::size_allocate ($x, $y, $w, $h); 1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1122
1123 $self->_set_text ($self->{text});
1124} 1343}
1125 1344
1126sub set_text { 1345sub set_text {
1127 my ($self, $text) = @_; 1346 my ($self, $text) = @_;
1128 1347
1132} 1351}
1133 1352
1134sub key_down { 1353sub key_down {
1135 my ($self, $ev) = @_; 1354 my ($self, $ev) = @_;
1136 1355
1137 my $mod = $ev->key_mod; 1356 my $mod = $ev->{mod};
1138 my $sym = $ev->key_sym; 1357 my $sym = $ev->{sym};
1139
1140 my $uni = $ev->key_unicode; 1358 my $uni = $ev->{unicode};
1141 1359
1142 my $text = $self->get_text; 1360 my $text = $self->get_text;
1143 1361
1144 if ($sym == SDLK_BACKSPACE) { 1362 if ($sym == 8) {
1145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1146 } elsif ($sym == SDLK_DELETE) { 1364 } elsif ($sym == 127) {
1147 substr $text, $self->{cursor}, 1, ""; 1365 substr $text, $self->{cursor}, 1, "";
1148 } elsif ($sym == SDLK_LEFT) { 1366 } elsif ($sym == CFClient::SDLK_LEFT) {
1149 --$self->{cursor} if $self->{cursor}; 1367 --$self->{cursor} if $self->{cursor};
1150 } elsif ($sym == SDLK_RIGHT) { 1368 } elsif ($sym == CFClient::SDLK_RIGHT) {
1151 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1369 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1152 } elsif ($sym == SDLK_HOME) { 1370 } elsif ($sym == CFClient::SDLK_HOME) {
1153 $self->{cursor} = 0; 1371 $self->{cursor} = 0;
1154 } elsif ($sym == SDLK_END) { 1372 } elsif ($sym == CFClient::SDLK_END) {
1155 $self->{cursor} = length $text; 1373 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) { 1374 } elsif ($sym == 27) {
1157 $self->emit ('escape'); 1375 $self->emit ('escape');
1158 } elsif ($uni) { 1376 } elsif ($uni) {
1159 substr $text, $self->{cursor}++, 0, chr $uni; 1377 substr $text, $self->{cursor}++, 0, chr $uni;
1160 } 1378 }
1161 1379
1236 1454
1237package CFClient::UI::Entry; 1455package CFClient::UI::Entry;
1238 1456
1239our @ISA = CFClient::UI::EntryBase::; 1457our @ISA = CFClient::UI::EntryBase::;
1240 1458
1241use SDL; 1459use CFClient::OpenGL;
1242use SDL::OpenGL;
1243 1460
1244sub key_down { 1461sub key_down {
1245 my ($self, $ev) = @_; 1462 my ($self, $ev) = @_;
1246 1463
1247 my $sym = $ev->key_sym; 1464 my $sym = $ev->{sym};
1248 1465
1249 if ($sym == SDLK_RETURN) { 1466 if ($sym == 13) {
1250 $self->emit (activate => $self->get_text); 1467 $self->emit (activate => $self->get_text);
1251 $self->update; 1468 $self->update;
1252 1469
1253 } else { 1470 } else {
1254 $self->SUPER::key_down ($ev); 1471 $self->SUPER::key_down ($ev);
1260 1477
1261package CFClient::UI::Button; 1478package CFClient::UI::Button;
1262 1479
1263our @ISA = CFClient::UI::Label::; 1480our @ISA = CFClient::UI::Label::;
1264 1481
1265use SDL; 1482use CFClient::OpenGL;
1266use SDL::OpenGL;
1267 1483
1268my @tex = 1484my @tex =
1269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1270 qw(b1_button_active.png); 1486 qw(b1_button_active.png);
1271 1487
1272sub new { 1488sub new {
1273 my $class = shift; 1489 my $class = shift;
1274 1490
1276 padding => 4, 1492 padding => 4,
1277 fg => [1, 1, 1], 1493 fg => [1, 1, 1],
1278 bg => [1, 1, 1, 0.2], 1494 bg => [1, 1, 1, 0.2],
1279 active_fg => [0, 0, 1], 1495 active_fg => [0, 0, 1],
1280 can_hover => 1, 1496 can_hover => 1,
1497 align => 0,
1498 valign => 0,
1499 can_events => 1,
1281 @_ 1500 @_
1282 ) 1501 )
1283} 1502}
1284 1503
1285sub button_up { 1504sub button_up {
1319package CFClient::UI::CheckBox; 1538package CFClient::UI::CheckBox;
1320 1539
1321our @ISA = CFClient::UI::DrawBG::; 1540our @ISA = CFClient::UI::DrawBG::;
1322 1541
1323my @tex = 1542my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1544 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326 1545
1327use SDL; 1546use CFClient::OpenGL;
1328use SDL::OpenGL;
1329 1547
1330sub new { 1548sub new {
1331 my $class = shift; 1549 my $class = shift;
1332 1550
1333 $class->SUPER::new ( 1551 $class->SUPER::new (
1344 my ($self) = @_; 1562 my ($self) = @_;
1345 1563
1346 ($self->{padding} * 2 + 6) x 2 1564 ($self->{padding} * 2 + 6) x 2
1347} 1565}
1348 1566
1349sub size_allocate {
1350 my ($self, $x, $y, $w, $h) = @_;
1351
1352 $self->_size_allocate ($x, $y, $w, $h);
1353}
1354
1355sub button_down { 1567sub button_down {
1356 my ($self, $ev, $x, $y) = @_; 1568 my ($self, $ev, $x, $y) = @_;
1357 1569
1358 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1570 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1359 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1571 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1385 glDisable GL_BLEND; 1597 glDisable GL_BLEND;
1386} 1598}
1387 1599
1388############################################################################# 1600#############################################################################
1389 1601
1602package CFClient::UI::Image;
1603
1604our @ISA = CFClient::UI::Base::;
1605
1606use CFClient::OpenGL;
1607use Carp qw/confess/;
1608
1609our %loaded_images;
1610
1611sub new {
1612 my $class = shift;
1613
1614 my $self = $class->SUPER::new (can_events => 0, @_);
1615
1616 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1617
1618 $loaded_images{$self->{image}} ||=
1619 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1620
1621 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1622
1623 Scalar::Util::weaken $loaded_images{$self->{image}};
1624
1625 $self->{aspect} = $tex->{w} / $tex->{h};
1626
1627 $self
1628}
1629
1630sub size_request {
1631 my ($self) = @_;
1632
1633 ($self->{tex}->{w}, $self->{tex}->{h})
1634}
1635
1636sub _draw {
1637 my ($self) = @_;
1638
1639 my $tex = $self->{tex};
1640
1641 my ($w, $h) = ($self->{w}, $self->{h});
1642
1643 if ($self->{rot90}) {
1644 glRotate 90, 0, 0, 1;
1645 glTranslate 0, -$self->{w}, 0;
1646
1647 ($w, $h) = ($h, $w);
1648 }
1649
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655 $tex->draw_quad (0, 0, $w, $h);
1656
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D;
1659}
1660
1661#############################################################################
1662
1663package CFClient::UI::VGauge;
1664
1665our @ISA = CFClient::UI::Base::;
1666
1667use List::Util qw(min max);
1668
1669use CFClient::OpenGL;
1670
1671my %tex = (
1672 food => [
1673 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1674 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1675 ],
1676 grace => [
1677 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1678 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1679 ],
1680 hp => [
1681 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1682 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1683 ],
1684 mana => [
1685 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1686 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1687 ],
1688);
1689
1690# eg. VGauge->new (gauge => 'food'), default gauge: food
1691sub new {
1692 my $class = shift;
1693
1694 my $self = $class->SUPER::new (
1695 type => 'food',
1696 @_
1697 );
1698
1699 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1700
1701 $self
1702}
1703
1704sub size_request {
1705 my ($self) = @_;
1706
1707 #my $tex = $tex{$self->{type}}[0];
1708 #@$tex{qw(w h)}
1709 (0, 0)
1710}
1711
1712sub set_max {
1713 my ($self, $max) = @_;
1714
1715 $self->{max_val} = $max;
1716}
1717
1718sub set_value {
1719 my ($self, $val, $max) = @_;
1720
1721 $self->set_max ($max)
1722 if defined $max;
1723
1724 $max = $self->{max_val};
1725 $self->{val} = $val;
1726
1727 $self->update;
1728}
1729
1730sub _draw {
1731 my ($self) = @_;
1732
1733 my $tex = $tex{$self->{type}};
1734 my ($t1, $t2, $t3) = @$tex;
1735
1736 my ($w, $h) = ($self->{w}, $self->{h});
1737
1738 if ($self->{vertical}) {
1739 glRotate 90, 0, 0, 1;
1740 glTranslate 0, -$self->{w}, 0;
1741
1742 ($w, $h) = ($h, $w);
1743 }
1744
1745 my $ycut = $self->{val} / ($self->{max_val} || 1);
1746
1747 my $ycut1 = max 0, min 1, $ycut;
1748 my $ycut2 = max 0, min 1, $ycut - 1;
1749
1750 my $h1 = $self->{h} * (1 - $ycut1);
1751 my $h2 = $self->{h} * (1 - $ycut2);
1752
1753 glEnable GL_BLEND;
1754 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1755 glEnable GL_TEXTURE_2D;
1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1757
1758 glBindTexture GL_TEXTURE_2D, $t1->{name};
1759 glBegin GL_QUADS;
1760 glTexCoord 0 , 0; glVertex 0 , 0;
1761 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1762 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1763 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1764 glEnd;
1765
1766 my $ycut1 = List::Util::min 1, $ycut;
1767 glBindTexture GL_TEXTURE_2D, $t2->{name};
1768 glBegin GL_QUADS;
1769 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1770 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1771 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1772 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1773 glEnd;
1774
1775 if ($t3) {
1776 glBindTexture GL_TEXTURE_2D, $t3->{name};
1777 glBegin GL_QUADS;
1778 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1779 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1780 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1781 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1782 glEnd;
1783 }
1784
1785 glDisable GL_BLEND;
1786 glDisable GL_TEXTURE_2D;
1787}
1788
1789#############################################################################
1790
1791package CFClient::UI::Gauge;
1792
1793our @ISA = CFClient::UI::VBox::;
1794
1795sub new {
1796 my ($class, %arg) = @_;
1797
1798 my $self = $class->SUPER::new (
1799 tooltip => $arg{type},
1800 can_events => 1,
1801 can_hover => 1,
1802 %arg,
1803 );
1804
1805 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1807 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1808
1809 $self
1810}
1811
1812sub set_fontsize {
1813 my ($self, $fsize) = @_;
1814
1815 $self->{value}->set_fontsize ($fsize);
1816 $self->{max} ->set_fontsize ($fsize);
1817}
1818
1819sub set_value {
1820 my ($self, $val, $max) = @_;
1821
1822 $self->set_max ($max)
1823 if defined $max;
1824
1825 $self->{gauge}->set_value ($val, $max);
1826 $self->{value}->set_text ($val);
1827}
1828
1829sub set_max {
1830 my ($self, $max) = @_;
1831
1832 $self->{gauge}->set_max ($max);
1833 $self->{max}->set_text ($max);
1834}
1835
1836#############################################################################
1837
1390package CFClient::UI::Slider; 1838package CFClient::UI::Slider;
1391 1839
1392use strict; 1840use strict;
1393 1841
1394use SDL::OpenGL; 1842use CFClient::OpenGL;
1395 1843
1396our @ISA = CFClient::UI::DrawBG::; 1844our @ISA = CFClient::UI::DrawBG::;
1397 1845
1398my @tex = 1846my @tex =
1399 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1847 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1409 # TODO: calculations are off 1857 # TODO: calculations are off
1410 my $self = $class->SUPER::new ( 1858 my $self = $class->SUPER::new (
1411 fg => [1, 1, 1], 1859 fg => [1, 1, 1],
1412 active_fg => [0, 0, 0], 1860 active_fg => [0, 0, 0],
1413 range => [0, 0, 100, 10], 1861 range => [0, 0, 100, 10],
1414 req_w => 40, 1862 req_w => 20,
1415 req_h => 13, 1863 req_h => 20,
1416 vertical => 0, 1864 vertical => 0,
1417 can_hover => 1, 1865 can_hover => 1,
1418 inner_pad => 5, 1866 inner_pad => 5,
1419 @_ 1867 @_
1420 ); 1868 );
1524 1972
1525package CFClient::UI::TextView; 1973package CFClient::UI::TextView;
1526 1974
1527our @ISA = CFClient::UI::HBox::; 1975our @ISA = CFClient::UI::HBox::;
1528 1976
1529use SDL::OpenGL; 1977use CFClient::OpenGL;
1530 1978
1531sub new { 1979sub new {
1532 my $class = shift; 1980 my $class = shift;
1533 1981
1534 my $self = $class->SUPER::new ( 1982 my $self = $class->SUPER::new (
1535 req_w => $::WIDTH / 6,
1536 req_h => $::HEIGHT / 6,
1537 fontsize => $::FONTSIZE, 1983 fontsize => 1,
1984 #font => default_font
1538 @_, 1985 @_,
1539 1986
1540 layout => (new CFClient::Layout), 1987 layout => (new CFClient::Layout),
1541 par => [], 1988 par => [],
1542 height => 0, 1989 height => 0,
1563sub text_height { 2010sub text_height {
1564 my ($self, $text) = @_; 2011 my ($self, $text) = @_;
1565 2012
1566 my $layout = $self->{layout}; 2013 my $layout = $self->{layout};
1567 2014
1568 $layout->set_height ($self->{fontsize}); 2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1569 $layout->set_width ($self->{w}); 2016 $layout->set_width ($self->{w});
1570 $layout->set_text ($text); 2017 $layout->set_text ($text);
1571 2018
1572 ($layout->size)[1] 2019 ($layout->size)[1]
1573} 2020}
1577 2024
1578 $self->{need_reflow}++; 2025 $self->{need_reflow}++;
1579 $self->update; 2026 $self->update;
1580} 2027}
1581 2028
1582sub size_request {
1583 my ($self) = @_;
1584
1585 ($self->{req_w}, $self->{req_h})
1586}
1587
1588sub size_allocate { 2029sub size_allocate {
1589 my ($self, $x, $y, $w, $h) = @_; 2030 my ($self, $w, $h) = @_;
1590 2031
1591 $self->SUPER::size_allocate ($x, $y, $w, $h); 2032 $self->SUPER::size_allocate ($w, $h);
1592 2033
2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1593 $self->{layout}->set_height ($self->{fontsize}); 2035 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1594 $self->{layout}->set_width ($self->{w}); 2036 $self->{layout}->set_width ($self->{children}[0]{w});
1595 2037
1596 $self->reflow; 2038 $self->reflow;
1597} 2039}
1598 2040
1599sub add_paragraph { 2041sub add_paragraph {
1649 my $y1 = $top + $self->{h}; 2091 my $y1 = $top + $self->{h};
1650 2092
1651 my $y = 0; 2093 my $y = 0;
1652 2094
1653 my $layout = $self->{layout}; 2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
1654 2098
1655 for my $par (@{$self->{par}}) { 2099 for my $par (@{$self->{par}}) {
1656 my $h = $par->[0]; 2100 my $h = $par->[0];
1657 2101
1658 if ($y0 < $y + $h && $y < $y1) { 2102 if ($y0 < $y + $h && $y < $y1) {
1686 2130
1687} 2131}
1688 2132
1689############################################################################# 2133#############################################################################
1690 2134
1691package CFClient::UI::MapWidget;
1692
1693use strict;
1694
1695use List::Util qw(min max);
1696
1697use SDL;
1698use SDL::OpenGL;
1699
1700our @ISA = CFClient::UI::Base::;
1701
1702sub new {
1703 my $class = shift;
1704
1705 $class->SUPER::new (
1706 z => -1,
1707 can_focus => 1,
1708 list => (glGenLists 1),
1709 @_
1710 )
1711}
1712
1713sub key_down {
1714 print "MAPKEYDOWN\n";
1715}
1716
1717sub key_up {
1718}
1719
1720sub button_down {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 $self->focus_in;
1724
1725 if ($ev->button == 2) {
1726 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729 $self->{motion} = sub {
1730 my ($ev, $x, $y) = @_;
1731
1732 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734 $::CFG->{map_shift_x} = $bw + $x - $ox;
1735 $::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737 $self->update;
1738 };
1739 }
1740}
1741
1742sub button_up {
1743 my ($self, $ev, $x, $y) = @_;
1744
1745 delete $self->{motion};
1746}
1747
1748sub mouse_motion {
1749 my ($self, $ev, $x, $y) = @_;
1750
1751 $self->{motion}->($ev, $x, $y) if $self->{motion};
1752}
1753
1754sub size_request {
1755 (
1756 1 + 32 * int $::WIDTH / 32,
1757 1 + 32 * int $::HEIGHT / 32,
1758 )
1759}
1760
1761sub update {
1762 my ($self) = @_;
1763
1764 $self->{need_update} = 1;
1765 $self->SUPER::update;
1766}
1767
1768sub draw {
1769 my ($self) = @_;
1770
1771 if (delete $self->{need_update}) {
1772 glNewList $self->{list}, GL_COMPILE;
1773
1774 if ($::MAP) {
1775 my $sw = int $::WIDTH / 32;
1776 my $sh = int $::HEIGHT / 32;
1777
1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1780
1781 glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1783 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1784
1785 if ($::CFG->{fow_enable}) {
1786 if ($::CFG->{fow_smooth}) { # smooth fog of war
1787 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1788 glConvolutionFilter2D
1789 GL_CONVOLUTION_2D,
1790 GL_ALPHA,
1791 3, 3,
1792 GL_ALPHA, GL_FLOAT,
1793 pack "f*",
1794 0.1, 0.1, 0.1,
1795 0.1, 0.2, 0.1,
1796 0.1, 0.1, 0.1,
1797 ;
1798 glEnable GL_CONVOLUTION_2D;
1799 }
1800
1801 $self->{fow_texture} = new CFClient::Texture
1802 w => $w,
1803 h => $h,
1804 data => $data,
1805 internalformat => GL_ALPHA,
1806 format => GL_ALPHA;
1807
1808 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1814
1815 glColor +($::CFG->{fow_intensity}) x 3, 1;
1816 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1817
1818 glDisable GL_TEXTURE_2D;
1819 glDisable GL_BLEND;
1820 }
1821
1822 # HACK BEGIN
1823 {
1824 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825 my ($w, $h) = (250, 250);
1826
1827 glEnable GL_BLEND;
1828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829 glEnable GL_TEXTURE_2D;
1830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832 $self->{mapmap_texture} =
1833 new CFClient::Texture
1834 w => $w,
1835 h => $h,
1836 data => $::MAP->mapmap ($w, $h),
1837 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839 $self->{mapmap_texture}->draw_quad (100, 100);
1840
1841 glDisable GL_TEXTURE_2D;
1842 glDisable GL_BLEND;
1843 }
1844 # HACK END
1845 }
1846
1847 glEndList;
1848 }
1849
1850 glPushMatrix;
1851 glCallList $self->{list};
1852 glPopMatrix;
1853
1854 if ($FOCUS != $self) {
1855 glColor 64/255, 64/255, 64/255;
1856 glLogicOp GL_AND;
1857 glEnable GL_COLOR_LOGIC_OP;
1858 glBegin GL_QUADS;
1859 glVertex 0, 0;
1860 glVertex 0, $::HEIGHT;
1861 glVertex $::WIDTH, $::HEIGHT;
1862 glVertex $::WIDTH, 0;
1863 glEnd;
1864 glDisable GL_COLOR_LOGIC_OP;
1865 }
1866}
1867
1868my %DIR = (
1869 SDLK_KP8, [1, "north"],
1870 SDLK_KP9, [2, "northeast"],
1871 SDLK_KP6, [3, "east"],
1872 SDLK_KP3, [4, "southeast"],
1873 SDLK_KP2, [5, "south"],
1874 SDLK_KP1, [6, "southwest"],
1875 SDLK_KP4, [7, "west"],
1876 SDLK_KP7, [8, "northwest"],
1877
1878 SDLK_UP, [1, "north"],
1879 SDLK_RIGHT, [3, "east"],
1880 SDLK_DOWN, [5, "south"],
1881 SDLK_LEFT, [7, "west"],
1882);
1883
1884sub key_down {
1885 my ($self, $ev) = @_;
1886
1887 my $mod = $ev->key_mod;
1888 my $sym = $ev->key_sym;
1889
1890 if ($sym == SDLK_KP5) {
1891 $::CONN->user_send ("stay fire");
1892 } elsif ($sym == SDLK_a) {
1893 $::CONN->user_send ("apply");
1894 } elsif ($sym == SDLK_QUOTE) {
1895 $self->emit ('activate_console');
1896 } elsif ($sym == SDLK_SLASH) {
1897 $self->emit ('activate_console' => '/');
1898 } elsif (exists $DIR{$sym}) {
1899 if ($mod & KMOD_SHIFT) {
1900 $self->{shft}++;
1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1902 } elsif ($mod & KMOD_CTRL) {
1903 $self->{ctrl}++;
1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1905 } else {
1906 $::CONN->user_send ("$DIR{$sym}[1]");
1907 }
1908 }
1909}
1910
1911sub key_up {
1912 my ($self, $ev) = @_;
1913
1914 my $mod = $ev->key_mod;
1915 my $sym = $ev->key_sym;
1916
1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1918 $::CONN->user_send ("fire_stop");
1919 }
1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1921 $::CONN->user_send ("run_stop");
1922 }
1923}
1924
1925#############################################################################
1926
1927package CFClient::UI::Animator; 2135package CFClient::UI::Animator;
1928 2136
1929use SDL::OpenGL; 2137use CFClient::OpenGL;
1930 2138
1931our @ISA = CFClient::UI::Bin::; 2139our @ISA = CFClient::UI::Bin::;
1932 2140
1933sub moveto { 2141sub moveto {
1934 my ($self, $x, $y) = @_; 2142 my ($self, $x, $y) = @_;
1974 my $class = shift; 2182 my $class = shift;
1975 2183
1976 my $self = $class->SUPER::new ( 2184 my $self = $class->SUPER::new (
1977 state => 0, 2185 state => 0,
1978 connect_activate => \&toggle_flopper, 2186 connect_activate => \&toggle_flopper,
2187 can_events => 1,
1979 @_ 2188 @_
1980 ); 2189 );
1981 2190
1982 if ($self->{state}) { 2191 if ($self->{state}) {
1983 $self->{state} = 0; 2192 $self->{state} = 0;
2003 $self->emit (changed => $self->{state}); 2212 $self->emit (changed => $self->{state});
2004} 2213}
2005 2214
2006############################################################################# 2215#############################################################################
2007 2216
2217package CFClient::UI::Tooltip;
2218
2219our @ISA = CFClient::UI::Bin::;
2220
2221use CFClient::OpenGL;
2222
2223sub new {
2224 my $class = shift;
2225
2226 $class->SUPER::new (
2227 @_,
2228 can_events => 0,
2229 )
2230}
2231
2232sub set_markup {
2233 my ($self, $text) = @_;
2234
2235 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2236 $self->{label}->set_markup ($text);
2237 $self->add ($self->{label});
2238}
2239
2240sub size_request {
2241 my ($self) = @_;
2242
2243 $self->child->set_max_size ($::WIDTH * 0.3);
2244
2245 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2246
2247 ($w + 4, $h + 4)
2248}
2249
2250sub size_allocate {
2251 my ($self, $w, $h) = @_;
2252
2253 $self->SUPER::size_allocate ($w - 4, $h - 4);
2254}
2255
2256sub _draw {
2257 my ($self) = @_;
2258
2259 glPushMatrix;
2260 glTranslate 0.375, 0.375;
2261
2262 my ($w, $h) = @$self{qw(w h)};
2263
2264 glColor 1, 0.8, 0.4;
2265 glBegin GL_QUADS;
2266 glVertex 0 , 0;
2267 glVertex 0 , $h;
2268 glVertex $w, $h;
2269 glVertex $w, 0;
2270 glEnd;
2271
2272 glColor 0, 0, 0;
2273 glBegin GL_LINE_LOOP;
2274 glVertex 0 , 0;
2275 glVertex 0 , $h;
2276 glVertex $w, $h;
2277 glVertex $w, 0;
2278 glEnd;
2279
2280 glPopMatrix;
2281
2282 glTranslate 2, 2;
2283 $self->SUPER::_draw;
2284}
2285
2286#############################################################################
2287
2288package CFClient::UI::Face;
2289
2290our @ISA = CFClient::UI::Base::;
2291
2292use CFClient::OpenGL;
2293
2294sub new {
2295 my $class = shift;
2296
2297 $class->SUPER::new (
2298 aspect => 1,
2299 @_,
2300 )
2301}
2302
2303sub size_request {
2304 (32, 8)
2305}
2306
2307sub draw {
2308 my ($self) = @_;
2309
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311
2312 if ($tex) {
2313 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317 glColor 1, 1, 1, 1;
2318 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2319 glDisable GL_TEXTURE_2D;
2320 glDisable GL_BLEND;
2321 }
2322}
2323
2324#############################################################################
2325
2008package CFClient::UI::Root; 2326package CFClient::UI::Root;
2009 2327
2010our @ISA = CFClient::UI::Container::; 2328our @ISA = CFClient::UI::Container::;
2011 2329
2012use SDL::OpenGL; 2330use CFClient::OpenGL;
2331
2332sub check_size {
2333 my ($self) = @_;
2334
2335 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2336}
2013 2337
2014sub size_request { 2338sub size_request {
2015 ($::WIDTH, $::HEIGHT) 2339 ($::WIDTH, $::HEIGHT)
2016} 2340}
2017 2341
2018sub size_allocate { 2342sub configure {
2019 my ($self, $x, $y, $w, $h) = @_; 2343 my ($self, $x, $y, $w, $h) = @_;
2020 2344
2021 $self->_size_allocate ($x, $y, $w, $h); 2345 $self->SUPER::configure ($x, $y, $w, $h);
2022 2346
2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2024 for @{$self->{children}}; 2347 for my $child (@{$self->{children}}) {
2348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2349
2350 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2351 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2352 $child->configure ($X, $Y, $W,$H);
2353 }
2025} 2354}
2026 2355
2027sub _topleft { 2356sub _topleft {
2028 my ($self, $x, $y) = @_; 2357 my ($self, $x, $y) = @_;
2029 2358
2031} 2360}
2032 2361
2033sub update { 2362sub update {
2034 my ($self) = @_; 2363 my ($self) = @_;
2035 2364
2036 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2365 $self->check_size;
2037 ::refresh (); 2366 ::refresh ();
2038} 2367}
2039 2368
2040sub add { 2369sub add {
2041 my ($self, $widget) = @_; 2370 my ($self, $child) = @_;
2042 2371
2372 # integerize window positions
2373 $child->{x} = int $child->{x};
2374 $child->{y} = int $child->{y};
2375
2043 $self->SUPER::add ($widget); 2376 $self->SUPER::add ($child);
2044
2045 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2046} 2377}
2047 2378
2048sub on_refresh { 2379sub on_refresh {
2049 my ($self, $id, $cb) = @_; 2380 my ($self, $id, $cb) = @_;
2050 2381
2074############################################################################# 2405#############################################################################
2075 2406
2076package CFClient::UI; 2407package CFClient::UI;
2077 2408
2078$ROOT = new CFClient::UI::Root; 2409$ROOT = new CFClient::UI::Root;
2410$TOOLTIP = new CFClient::UI::Tooltip;
2079 2411
20801 24121
2081 2413

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines