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.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.164 by root, Mon Apr 24 06:57:39 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) = @_;
117 185
118 $self->{x} = int $x; 186 $self->{x} = int $x;
119 $self->{y} = int $y; 187 $self->{y} = int $y;
120 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
121 189
122 $self->update; 190 $self->update;
123} 191}
124 192
125sub needs_redraw { 193sub set_size {
126 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
127} 200}
128 201
129sub size_request { 202sub size_request {
130 require Carp; 203 require Carp;
131 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
132} 205}
133 206
134sub configure { 207sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
136 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) {
137 $self->{x} = $x; 223 $self->{x} = $x;
138 $self->{y} = $y; 224 $self->{y} = $y;
225 $self->update;
226 }
139 227
140 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
141
142 $self->{w} = $w; 229 $self->{w} = $w;
143 $self->{h} = $h; 230 $self->{h} = $h;
144 231
145 $self->size_allocate ($w, $h); 232 $self->size_allocate ($w, $h);
233 $self->update;
234 }
146} 235}
147 236
148sub size_allocate { 237sub size_allocate {
149 # nothing to be done 238 # nothing to be done
239}
240
241sub set_max_size {
242 my ($self, $w, $h) = @_;
243
244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
150} 246}
151 247
152# return top left coordinates 248# return top left coordinates
153sub _topleft { 249sub _topleft {
154 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
237 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
238 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
239 glEnd; 335 glEnd;
240 glDisable GL_BLEND; 336 glDisable GL_BLEND;
241 } 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 }
242} 352}
243 353
244sub _draw { 354sub _draw {
245 my ($self) = @_; 355 my ($self) = @_;
246 356
247 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
248} 358}
249 359
250sub find_widget { 360sub find_widget {
251 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
252 364
253 return $self 365 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 368
… …
264} 376}
265 377
266sub check_size { 378sub check_size {
267 my ($self) = @_; 379 my ($self) = @_;
268 380
269 my ($w, $h) = $self->size_request; 381 $self->{parent}
382 or return 1;
270 383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
271 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w; 389 $self->{req_w} = $w;
273 $self->{req_h} = $h; 390 $self->{req_h} = $h;
274 391
275 $self->{parent}->check_size 392 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h); 393 or $self->size_allocate (
279 $self->update; 394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
280 } 401 }
281} 402}
282 403
283sub update { 404sub update {
284 my ($self) = @_; 405 my ($self) = @_;
… …
294} 415}
295 416
296sub emit { 417sub emit {
297 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
298 419
299 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300 $cb->($self, @args);
301 }
302} 421}
303 422
304sub DESTROY { 423sub DESTROY {
305 my ($self) = @_; 424 my ($self) = @_;
306 425
… …
312package CFClient::UI::DrawBG; 431package CFClient::UI::DrawBG;
313 432
314our @ISA = CFClient::UI::Base::; 433our @ISA = CFClient::UI::Base::;
315 434
316use strict; 435use strict;
317use SDL::OpenGL; 436use CFClient::OpenGL;
318 437
319sub new { 438sub new {
320 my $class = shift; 439 my $class = shift;
321 440
322 # range [value, low, high, page] 441 # range [value, low, high, page]
… …
351 470
352package CFClient::UI::Empty; 471package CFClient::UI::Empty;
353 472
354our @ISA = CFClient::UI::Base::; 473our @ISA = CFClient::UI::Base::;
355 474
475sub new {
476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
479
356sub size_request { 480sub size_request {
357 (0, 0) 481 (0, 0)
358} 482}
359 483
360sub draw { } 484sub draw { }
… …
368sub new { 492sub new {
369 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
370 494
371 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
372 496
373 my $self = $class->SUPER::new (children => [], %arg); 497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
375 499
376 $self 500 $self
377} 501}
378 502
… …
386 $self->{children} = [ 510 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 511 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 512 @{$self->{children}}, $child
389 ]; 513 ];
390 514
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 515 $child->check_size;
394} 516}
395 517
396sub remove { 518sub remove {
397 my ($self, $widget) = @_; 519 my ($self, $child) = @_;
398 520
521 delete $child->{parent};
522 $child->hide;
523
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 525
401 $self->check_size; 526 $self->check_size;
527 $self->update;
528}
529
530sub clear {
531 my ($self) = @_;
532
533 my $children = delete $self->{children};
534 $self->{children} = [];
535
536 for (@$children) {
537 delete $_->{parent};
538 $_->hide;
539 }
402} 540}
403 541
404sub find_widget { 542sub find_widget {
405 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
406 544
… …
436 574
437 $class->SUPER::new (children => [$child], %arg) 575 $class->SUPER::new (children => [$child], %arg)
438} 576}
439 577
440sub add { 578sub add {
441 my ($self, $widget) = @_; 579 my ($self, $child) = @_;
442 580
443 $self->{children} = []; 581 $self->{children} = [];
444 582
445 $self->SUPER::add ($widget); 583 $self->SUPER::add ($child);
446} 584}
447 585
448sub remove { 586sub remove {
449 my ($self, $widget) = @_; 587 my ($self, $widget) = @_;
450 588
… …
470 608
471package CFClient::UI::Window; 609package CFClient::UI::Window;
472 610
473our @ISA = CFClient::UI::Bin::; 611our @ISA = CFClient::UI::Bin::;
474 612
475use SDL::OpenGL; 613use CFClient::OpenGL;
476 614
477sub new { 615sub new {
478 my ($class, %arg) = @_; 616 my ($class, %arg) = @_;
479 617
480 my $self = $class->SUPER::new (%arg); 618 my $self = $class->SUPER::new (%arg);
… …
534sub new { die } 672sub new { die }
535 673
536sub size_request { 674sub size_request {
537 my ($self) = @_; 675 my ($self) = @_;
538 676
539 @$self{qw(child_w child_h)} = $self->child->size_request; 677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
540 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 679
542 @$self{qw(child_w child_h)} 680 @$self{qw(child_w child_h)}
543} 681}
544 682
… …
553 691
554package CFClient::UI::Frame; 692package CFClient::UI::Frame;
555 693
556our @ISA = CFClient::UI::Bin::; 694our @ISA = CFClient::UI::Bin::;
557 695
558use SDL::OpenGL; 696use CFClient::OpenGL;
559
560sub size_request {
561 my ($self) = @_;
562 my $chld = $self->child
563 or return (0, 0);
564
565 $chld->move (2, 2);
566
567 map { $_ + 4 } $chld->size_request;
568}
569
570sub size_allocate {
571 my ($self, $x, $y, $w, $h) = @_;
572
573 $self->child->configure (2, 2, $w - 4, $h - 4);
574}
575
576sub _draw {
577 my ($self) = @_;
578
579 my $chld = $self->child;
580
581 my ($w, $h) = $chld->size_request;
582
583 glBegin GL_QUADS;
584 glColor 0, 0, 0;
585 glVertex 0 , 0;
586 glVertex 0 , $h + 4;
587 glVertex $w + 4 , $h + 4;
588 glVertex $w + 4 , 0;
589 glEnd;
590
591 $chld->draw;
592}
593
594#############################################################################
595
596package CFClient::UI::FancyFrame;
597
598our @ISA = CFClient::UI::Bin::;
599
600use SDL::OpenGL;
601
602my @tex =
603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
604 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605 697
606sub new { 698sub new {
607 my $class = shift; 699 my $class = shift;
608 700
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 701 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 702 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 703 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 704 border => 0.8,
615 @_ 705 @_
616 ) 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 => 0,
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
617} 771}
618 772
619sub size_request { 773sub size_request {
620 my ($self) = @_; 774 my ($self) = @_;
621 775
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624 my ($w, $h) = $self->SUPER::size_request; 776 my ($w, $h) = $self->SUPER::size_request;
625 777
626 ( 778 (
627 $w + $self->{border} * 2, 779 $w + $self->border * 2,
628 $h + $self->{border} * 2, 780 $h + $self->border * 2,
629 ) 781 )
630} 782}
631 783
632sub size_allocate { 784sub size_allocate {
633 my ($self, $w, $h) = @_; 785 my ($self, $w, $h) = @_;
634 786
635 $h -= List::Util::max 0, $self->{border} * 2; 787 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 788 $w -= List::Util::max 0, $self->border * 2;
637 789
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
791 if $self->{title};
792
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 793 $self->child->configure ($self->border, $self->border, $w, $h);
639} 794}
640 795
641sub button_down { 796sub button_down {
642 my ($self, $ev, $x, $y) = @_; 797 my ($self, $ev, $x, $y) = @_;
643 798
799 my $border = $self->border;
800
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 801 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 802 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 803
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 804 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 805 my ($bw, $bh) = ($self->{w}, $self->{h});
649 806
650 $self->{motion} = sub { 807 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 808 my ($ev, $x, $y) = @_;
652 809
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 810 ($x, $y) = ($ev->{x}, $ev->{y});
654 811
655 $self->{user_w} = $bw + $x - $ox; 812 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 813 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 814 $self->check_size;
658 }; 815 };
659 816
660 } elsif ($x >= 0 && $x < $self->{w} 817 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 818 && $y >= 0 && $y < $border) {
662 819
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 820 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 821 my ($bx, $by) = ($self->{x}, $self->{y});
665 822
666 $self->{motion} = sub { 823 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 824 my ($ev, $x, $y) = @_;
668 825
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 826 ($x, $y) = ($ev->{x}, $ev->{y});
670 827
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 828 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 829 $self->update;
673 }; 830 };
674 } 831 }
… …
695 glEnable GL_BLEND; 852 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 854 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 856
857 my $border = $self->border;
858
700 glColor @{ $self->{border_bg} }; 859 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 860 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 861 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 863 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 864
706 my $bg = $tex[0]; 865 my $bg = $tex[0];
707 866
708 # TODO: repeat texture not scale 867 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 868 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 871 glColor @{ $self->{bg} };
713 872
714 $bg->{s} = $rep_x; 873 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 874 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 875 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 876 $bg->draw_quad ($border, $border, $cw, $ch);
718 877
719 glDisable GL_TEXTURE_2D; 878 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 879 glDisable GL_BLEND;
721 880
881 $self->{title}->draw if $self->{title};
722 $self->child->draw; 882 $self->child->draw;
723} 883}
724 884
725############################################################################# 885#############################################################################
726 886
… …
728 888
729our @ISA = CFClient::UI::Base::; 889our @ISA = CFClient::UI::Base::;
730 890
731use List::Util qw(max sum); 891use List::Util qw(max sum);
732 892
733use SDL::OpenGL; 893use CFClient::OpenGL;
734 894
735sub new { 895sub new {
736 my $class = shift; 896 my $class = shift;
737 897
738 $class->SUPER::new ( 898 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 905 my ($self, $x, $y, $child) = @_;
746 906
747 $child->set_parent ($self); 907 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 908 $self->{children}[$y][$x] = $child;
749 909
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 910 $child->check_size;
753} 911}
754 912
755# 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?
756sub clear { 914sub clear {
757 my ($self) = @_; 915 my ($self) = @_;
758 916
759 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
760 $self->update; 924 $self->update;
761} 925}
762 926
763sub get_wh { 927sub get_wh {
764 my ($self) = @_; 928 my ($self) = @_;
… …
770 or next; 934 or next;
771 935
772 for my $x (0 .. $#$row) { 936 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 937 my $widget = $row->[$x]
774 or next; 938 or next;
775 my ($w, $h) = $widget->size_request; 939 my ($w, $h) = @$widget{qw(req_w req_h)};
776 940
777 $w[$x] = max $w[$x], $w; 941 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 942 $h[$y] = max $h[$y], $h;
779 } 943 }
780 } 944 }
… …
885 1049
886 ($h, $w) = ($w, $h); 1050 ($h, $w) = ($w, $h);
887 1051
888 my $children = $self->{children}; 1052 my $children = $self->{children};
889 1053
890 my @h = map +($_->size_request)[0], @$children; 1054 my @h = map $_->{req_w}, @$children;
891 1055
892 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
893 1057
894 if ($req_h > $h) { 1058 if ($req_h > $h) {
895 # ah well, not enough space 1059 # ah well, not enough space
… …
943sub size_allocate { 1107sub size_allocate {
944 my ($self, $w, $h) = @_; 1108 my ($self, $w, $h) = @_;
945 1109
946 my $children = $self->{children}; 1110 my $children = $self->{children};
947 1111
948 my @h = map +($_->size_request)[1], @$children; 1112 my @h = map $_->{req_h}, @$children;
949 1113
950 my $req_h = List::Util::sum @h; 1114 my $req_h = List::Util::sum @h;
951 1115
952 if ($req_h > $h) { 1116 if ($req_h > $h) {
953 # ah well, not enough space 1117 # ah well, not enough space
… …
981 1145
982package CFClient::UI::Label; 1146package CFClient::UI::Label;
983 1147
984our @ISA = CFClient::UI::Base::; 1148our @ISA = CFClient::UI::Base::;
985 1149
986use SDL::OpenGL; 1150use CFClient::OpenGL;
987 1151
988sub new { 1152sub new {
989 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
990 1154
991 my $self = $class->SUPER::new ( 1155 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1156 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1157 #font => default_font
1158 fontsize => 1,
994 text => "", 1159 text => "",
995 align => -1, 1160 align => -1,
996 valign => -1, 1161 valign => -1,
997 padding => 2, 1162 padding => 2,
998 layout => new CFClient::Layout, 1163 layout => new CFClient::Layout,
1164 can_events => 0,
999 %arg 1165 %arg
1000 ); 1166 );
1001 1167
1002 $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 }
1003 1173
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1174 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1176
1007 $self 1177 $self
1008} 1178}
1009 1179
1010sub escape_text { 1180sub escape {
1011 local $_ = $_[1]; 1181 local $_ = $_[1];
1012 1182
1013 s/&/&amp;/g; 1183 s/&/&amp;/g;
1014 s/>/&gt;/g; 1184 s/>/&gt;/g;
1015 s/</&lt;/g; 1185 s/</&lt;/g;
… …
1021 my ($self, $text) = @_; 1191 my ($self, $text) = @_;
1022 1192
1023 $self->{layout}->set_text ($text); 1193 $self->{layout}->set_text ($text);
1024 1194
1025 delete $self->{texture}; 1195 delete $self->{texture};
1196 $self->check_size;
1026 $self->update; 1197 $self->update;
1027} 1198}
1028 1199
1029sub set_markup { 1200sub set_markup {
1030 my ($self, $markup) = @_; 1201 my ($self, $markup) = @_;
1031 1202
1032 $self->{layout}->set_markup ($markup); 1203 $self->{layout}->set_markup ($markup);
1033 1204
1034 delete $self->{texture}; 1205 delete $self->{texture};
1206 $self->check_size;
1035 $self->update; 1207 $self->update;
1036} 1208}
1037 1209
1038sub size_request { 1210sub size_request {
1039 my ($self) = @_; 1211 my ($self) = @_;
1040 1212
1041 $self->{layout}->set_width; 1213 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1);
1042 $self->{layout}->set_height ($self->{fontsize}); 1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1216
1044 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 }
1045 1228
1046 ( 1229 (
1047 $w + $self->{padding} * 2, 1230 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1231 $h + $self->{padding} * 2,
1049 ) 1232 )
… …
1053 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1054 1237
1055 delete $self->{texture}; 1238 delete $self->{texture};
1056} 1239}
1057 1240
1058sub update { 1241sub set_fontsize {
1059 my ($self) = @_; 1242 my ($self, $fontsize) = @_;
1060 1243
1244 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1245 delete $self->{texture};
1246 $self->check_size;
1062 $self->SUPER::update; 1247 $self->update;
1063} 1248}
1064 1249
1065sub _draw { 1250sub _draw {
1066 my ($self) = @_; 1251 my ($self) = @_;
1067 1252
1068 my $tex = $self->{texture} ||= do { 1253 my $tex = $self->{texture} ||= do {
1254 $self->{layout}->set_font ($self->{font}) if $self->{font};
1069 $self->{layout}->set_width ($self->{w}); 1255 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1257 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1258 };
1073 1259
1074 glEnable GL_BLEND; 1260 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1286
1101package CFClient::UI::EntryBase; 1287package CFClient::UI::EntryBase;
1102 1288
1103our @ISA = CFClient::UI::Label::; 1289our @ISA = CFClient::UI::Label::;
1104 1290
1105use SDL; 1291use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1292
1108sub new { 1293sub new {
1109 my $class = shift; 1294 my $class = shift;
1110 1295
1111 $class->SUPER::new ( 1296 $class->SUPER::new (
1112 fg => [1, 1, 1], 1297 fg => [1, 1, 1],
1113 bg => [0, 0, 0, 0.2], 1298 bg => [0, 0, 0, 0.2],
1114 active_bg => [1, 1, 1, 0.5], 1299 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1300 active_fg => [0, 0, 0],
1116 can_hover => 1, 1301 can_hover => 1,
1117 can_focus => 1, 1302 can_focus => 1,
1118 valign => 0, 1303 valign => 0,
1304 can_events => 1,
1119 @_ 1305 @_
1120 ) 1306 )
1121} 1307}
1122 1308
1123sub _set_text { 1309sub _set_text {
… …
1125 1311
1126 delete $self->{cur_h}; 1312 delete $self->{cur_h};
1127 1313
1128 return if $self->{text} eq $text; 1314 return if $self->{text} eq $text;
1129 1315
1316 delete $self->{texture};
1317
1130 $self->{last_activity} = $::NOW; 1318 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1319 $self->{text} = $text;
1132 1320
1133 $text =~ s/./*/g if $self->{hidden}; 1321 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1322 $self->{layout}->set_text ("$text ");
… …
1149} 1337}
1150 1338
1151sub size_allocate { 1339sub size_allocate {
1152 my ($self, $w, $h) = @_; 1340 my ($self, $w, $h) = @_;
1153 1341
1154 $self->_set_text ($self->{text}); 1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1343}
1156 1344
1157sub set_text { 1345sub set_text {
1158 my ($self, $text) = @_; 1346 my ($self, $text) = @_;
1159 1347
… …
1163} 1351}
1164 1352
1165sub key_down { 1353sub key_down {
1166 my ($self, $ev) = @_; 1354 my ($self, $ev) = @_;
1167 1355
1168 my $mod = $ev->key_mod; 1356 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1357 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1358 my $uni = $ev->{unicode};
1172 1359
1173 my $text = $self->get_text; 1360 my $text = $self->get_text;
1174 1361
1175 if ($sym == SDLK_BACKSPACE) { 1362 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1364 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1365 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1366 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1367 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1368 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1369 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1370 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1371 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1372 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1373 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1374 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1375 $self->emit ('escape');
1189 } elsif ($uni) { 1376 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1377 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1378 }
1192 1379
… …
1267 1454
1268package CFClient::UI::Entry; 1455package CFClient::UI::Entry;
1269 1456
1270our @ISA = CFClient::UI::EntryBase::; 1457our @ISA = CFClient::UI::EntryBase::;
1271 1458
1272use SDL; 1459use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1460
1275sub key_down { 1461sub key_down {
1276 my ($self, $ev) = @_; 1462 my ($self, $ev) = @_;
1277 1463
1278 my $sym = $ev->key_sym; 1464 my $sym = $ev->{sym};
1279 1465
1280 if ($sym == SDLK_RETURN) { 1466 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1467 $self->emit (activate => $self->get_text);
1282 $self->update; 1468 $self->update;
1283 1469
1284 } else { 1470 } else {
1285 $self->SUPER::key_down ($ev); 1471 $self->SUPER::key_down ($ev);
… …
1291 1477
1292package CFClient::UI::Button; 1478package CFClient::UI::Button;
1293 1479
1294our @ISA = CFClient::UI::Label::; 1480our @ISA = CFClient::UI::Label::;
1295 1481
1296use SDL; 1482use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1483
1299my @tex = 1484my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1486 qw(b1_button_active.png);
1302 1487
1303sub new { 1488sub new {
1304 my $class = shift; 1489 my $class = shift;
1305 1490
1306 $class->SUPER::new ( 1491 $class->SUPER::new (
1307 padding => 4, 1492 padding => 4,
1308 fg => [1, 1, 1], 1493 fg => [1, 1, 1],
1309 bg => [1, 1, 1, 0.2], 1494 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1495 active_fg => [0, 0, 1],
1311 can_hover => 1, 1496 can_hover => 1,
1312 align => 0, 1497 align => 0,
1313 valign => 0, 1498 valign => 0,
1499 can_events => 1,
1314 @_ 1500 @_
1315 ) 1501 )
1316} 1502}
1317 1503
1318sub button_up { 1504sub button_up {
… …
1352package CFClient::UI::CheckBox; 1538package CFClient::UI::CheckBox;
1353 1539
1354our @ISA = CFClient::UI::DrawBG::; 1540our @ISA = CFClient::UI::DrawBG::;
1355 1541
1356my @tex = 1542my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1544 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1545
1360use SDL; 1546use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1547
1363sub new { 1548sub new {
1364 my $class = shift; 1549 my $class = shift;
1365 1550
1366 $class->SUPER::new ( 1551 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1597 glDisable GL_BLEND;
1413} 1598}
1414 1599
1415############################################################################# 1600#############################################################################
1416 1601
1417package CFClient::UI::VGauge; 1602package CFClient::UI::Image;
1418 1603
1419our @ISA = CFClient::UI::Base::; 1604our @ISA = CFClient::UI::Base::;
1420 1605
1421use SDL::OpenGL; 1606use CFClient::OpenGL;
1607use Carp qw/confess/;
1422 1608
1423my %tex = ( 1609our %loaded_images;
1424 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ],
1428 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431 ],
1432 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ],
1436 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439 ],
1440);
1441 1610
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1611sub new {
1444 my $class = shift; 1612 my $class = shift;
1445 1613
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 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};
1447 1626
1448 $self 1627 $self
1449} 1628}
1450 1629
1451sub size_request { 1630sub size_request {
1452 my ($self) = @_; 1631 my ($self) = @_;
1453 1632
1454 my $tex = $tex{$self->{gauge}}[0]; 1633 ($self->{tex}->{w}, $self->{tex}->{h})
1455
1456 @$tex{qw(w h)}
1457}
1458
1459sub set_max {
1460 my ($self, $max) = @_;
1461
1462 $self->{max_val} = $max;
1463}
1464
1465sub set_value {
1466 my ($self, $val, $max) = @_;
1467
1468 $self->set_max ($max)
1469 if defined $max;
1470
1471 $max = $self->{max_val};
1472 $self->{val} = $val;
1473
1474 $self->update;
1475} 1634}
1476 1635
1477sub _draw { 1636sub _draw {
1478 my ($self) = @_; 1637 my ($self) = @_;
1479 1638
1480 my $tex = $tex{$self->{gauge}}; 1639 my $tex = $self->{tex};
1481 1640
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1641 my ($w, $h) = ($self->{w}, $self->{h});
1483 1642
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1643 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1644 glRotate 90, 0, 0, 1;
1645 glTranslate 0, -$self->{w}, 0;
1486 1646
1487 my $t1 = $tex->[0]; 1647 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1648 }
1489 1649
1490 glEnable GL_BLEND; 1650 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 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
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1750 my $h1 = $self->{h} * (1 - $ycut1);
1496 my $h2 = $ycut * $self->{h}; 1751 my $h2 = $self->{h} * (1 - $ycut2);
1497 1752
1498 my $yp = 0; 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;
1499 1757
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1758 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1759 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1760 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1761 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1762 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1763 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1764 glEnd;
1507 1765
1508 $yp += $h1; 1766 my $ycut1 = List::Util::min 1, $ycut;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1767 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1768 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1769 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1770 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1771 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1772 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516 glEnd; 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 }
1517 1784
1518 glDisable GL_BLEND; 1785 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1786 glDisable GL_TEXTURE_2D;
1520} 1787}
1521 1788
1522############################################################################# 1789#############################################################################
1523 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_hover => 1,
1801 %arg,
1802 );
1803
1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1806 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1807
1808 $self
1809}
1810
1811sub set_fontsize {
1812 my ($self, $fsize) = @_;
1813
1814 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize);
1816}
1817
1818sub set_value {
1819 my ($self, $val, $max) = @_;
1820
1821 $self->set_max ($max)
1822 if defined $max;
1823
1824 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833}
1834
1835#############################################################################
1836
1524package CFClient::UI::Slider; 1837package CFClient::UI::Slider;
1525 1838
1526use strict; 1839use strict;
1527 1840
1528use SDL::OpenGL; 1841use CFClient::OpenGL;
1529 1842
1530our @ISA = CFClient::UI::DrawBG::; 1843our @ISA = CFClient::UI::DrawBG::;
1531 1844
1532my @tex = 1845my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1846 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1856 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1857 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1858 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1859 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1860 range => [0, 0, 100, 10],
1548 req_w => 40, 1861 req_w => 20,
1549 req_h => 13, 1862 req_h => 20,
1550 vertical => 0, 1863 vertical => 0,
1551 can_hover => 1, 1864 can_hover => 1,
1552 inner_pad => 5, 1865 inner_pad => 5,
1553 @_ 1866 @_
1554 ); 1867 );
… …
1658 1971
1659package CFClient::UI::TextView; 1972package CFClient::UI::TextView;
1660 1973
1661our @ISA = CFClient::UI::HBox::; 1974our @ISA = CFClient::UI::HBox::;
1662 1975
1663use SDL::OpenGL; 1976use CFClient::OpenGL;
1664 1977
1665sub new { 1978sub new {
1666 my $class = shift; 1979 my $class = shift;
1667 1980
1668 my $self = $class->SUPER::new ( 1981 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6, 1982 fontsize => 1,
1670 req_h => $::HEIGHT / 6, 1983 can_events => 0,
1671 fontsize => $::FONTSIZE, 1984 #font => default_font
1672 @_, 1985 @_,
1673 1986
1674 layout => (new CFClient::Layout), 1987 layout => (new CFClient::Layout),
1675 par => [], 1988 par => [],
1676 height => 0, 1989 height => 0,
1677 children => [ 1990 children => [
1678 (new CFClient::UI::Empty expand => 1), 1991 (new CFClient::UI::Empty expand => 1),
1679 (new CFClient::UI::Slider vertical => 1), 1992 (new CFClient::UI::Slider vertical => 1),
1680 ], 1993 ],
1681 ); 1994 );
1682 1995
… …
1697sub text_height { 2010sub text_height {
1698 my ($self, $text) = @_; 2011 my ($self, $text) = @_;
1699 2012
1700 my $layout = $self->{layout}; 2013 my $layout = $self->{layout};
1701 2014
1702 $layout->set_height ($self->{fontsize}); 2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 2016 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 2017 $layout->set_text ($text);
1705 2018
1706 ($layout->size)[1] 2019 ($layout->size)[1]
1707} 2020}
… …
1711 2024
1712 $self->{need_reflow}++; 2025 $self->{need_reflow}++;
1713 $self->update; 2026 $self->update;
1714} 2027}
1715 2028
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 2029sub size_allocate {
1723 my ($self, $w, $h) = @_; 2030 my ($self, $w, $h) = @_;
1724 2031
2032 $self->SUPER::size_allocate ($w, $h);
2033
2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1725 $self->{layout}->set_height ($self->{fontsize}); 2035 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 2036 $self->{layout}->set_width ($self->{children}[0]{w});
1727 2037
1728 $self->reflow; 2038 $self->reflow;
1729 $self->update;
1730} 2039}
1731 2040
1732sub add_paragraph { 2041sub add_paragraph {
1733 my ($self, $color, $text) = @_; 2042 my ($self, $color, $text) = @_;
1734 2043
… …
1782 my $y1 = $top + $self->{h}; 2091 my $y1 = $top + $self->{h};
1783 2092
1784 my $y = 0; 2093 my $y = 0;
1785 2094
1786 my $layout = $self->{layout}; 2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
1787 2098
1788 for my $par (@{$self->{par}}) { 2099 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2100 my $h = $par->[0];
1790 2101
1791 if ($y0 < $y + $h && $y < $y1) { 2102 if ($y0 < $y + $h && $y < $y1) {
… …
1819 2130
1820} 2131}
1821 2132
1822############################################################################# 2133#############################################################################
1823 2134
1824package CFClient::UI::MapWidget;
1825
1826use strict;
1827
1828use List::Util qw(min max);
1829
1830use SDL;
1831use SDL::OpenGL;
1832
1833our @ISA = CFClient::UI::Base::;
1834
1835sub new {
1836 my $class = shift;
1837
1838 $class->SUPER::new (
1839 z => -1,
1840 can_focus => 1,
1841 list => (glGenLists 1),
1842 @_
1843 )
1844}
1845
1846sub key_down {
1847 print "MAPKEYDOWN\n";
1848}
1849
1850sub key_up {
1851}
1852
1853sub button_down {
1854 my ($self, $ev, $x, $y) = @_;
1855
1856 $self->focus_in;
1857
1858 if ($ev->button == 2) {
1859 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862 $self->{motion} = sub {
1863 my ($ev, $x, $y) = @_;
1864
1865 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867 $::CFG->{map_shift_x} = $bw + $x - $ox;
1868 $::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870 $self->update;
1871 };
1872 }
1873}
1874
1875sub button_up {
1876 my ($self, $ev, $x, $y) = @_;
1877
1878 delete $self->{motion};
1879}
1880
1881sub mouse_motion {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 $self->{motion}->($ev, $x, $y) if $self->{motion};
1885}
1886
1887sub size_request {
1888 (
1889 1 + 32 * int $::WIDTH / 32,
1890 1 + 32 * int $::HEIGHT / 32,
1891 )
1892}
1893
1894sub update {
1895 my ($self) = @_;
1896
1897 $self->{need_update} = 1;
1898 $self->SUPER::update;
1899}
1900
1901sub draw {
1902 my ($self) = @_;
1903
1904 if (delete $self->{need_update}) {
1905 glNewList $self->{list}, GL_COMPILE;
1906
1907 if ($::MAP) {
1908 my $sw = int $::WIDTH / 32;
1909 my $sh = int $::HEIGHT / 32;
1910
1911 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918 if ($::CFG->{fow_enable}) {
1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921 glConvolutionFilter2D (
1922 GL_CONVOLUTION_2D,
1923 GL_ALPHA,
1924 3, 3,
1925 GL_ALPHA, GL_FLOAT,
1926 pack "f*",
1927 0.1, 0.1, 0.1,
1928 0.1, 0.2, 0.1,
1929 0.1, 0.1, 0.1,
1930 );
1931 glEnable GL_CONVOLUTION_2D;
1932 }
1933
1934 $self->{fow_texture} = new CFClient::Texture
1935 w => $w,
1936 h => $h,
1937 data => $data,
1938 internalformat => GL_ALPHA,
1939 format => GL_ALPHA;
1940
1941 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943 glEnable GL_BLEND;
1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945 glEnable GL_TEXTURE_2D;
1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951 glDisable GL_TEXTURE_2D;
1952 glDisable GL_BLEND;
1953 }
1954
1955 # HACK BEGIN
1956 {
1957 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958 my ($w, $h) = (250, 250);
1959
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965 $self->{mapmap_texture} =
1966 new CFClient::Texture
1967 w => $w,
1968 h => $h,
1969 data => $::MAP->mapmap ($w, $h),
1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1973
1974 glDisable GL_TEXTURE_2D;
1975 glDisable GL_BLEND;
1976 }
1977 # HACK END
1978 }
1979
1980 glEndList;
1981 }
1982
1983 glPushMatrix;
1984 glCallList $self->{list};
1985 glPopMatrix;
1986
1987 if ($FOCUS != $self) {
1988 glColor 64/255, 64/255, 64/255;
1989 glLogicOp GL_AND;
1990 glEnable GL_COLOR_LOGIC_OP;
1991 glBegin GL_QUADS;
1992 glVertex 0, 0;
1993 glVertex 0, $::HEIGHT;
1994 glVertex $::WIDTH, $::HEIGHT;
1995 glVertex $::WIDTH, 0;
1996 glEnd;
1997 glDisable GL_COLOR_LOGIC_OP;
1998 }
1999}
2000
2001my %DIR = (
2002 SDLK_KP8, [1, "north"],
2003 SDLK_KP9, [2, "northeast"],
2004 SDLK_KP6, [3, "east"],
2005 SDLK_KP3, [4, "southeast"],
2006 SDLK_KP2, [5, "south"],
2007 SDLK_KP1, [6, "southwest"],
2008 SDLK_KP4, [7, "west"],
2009 SDLK_KP7, [8, "northwest"],
2010
2011 SDLK_UP, [1, "north"],
2012 SDLK_RIGHT, [3, "east"],
2013 SDLK_DOWN, [5, "south"],
2014 SDLK_LEFT, [7, "west"],
2015);
2016
2017sub key_down {
2018 my ($self, $ev) = @_;
2019
2020 my $mod = $ev->key_mod;
2021 my $sym = $ev->key_sym;
2022
2023 if ($sym == SDLK_KP5) {
2024 $::CONN->user_send ("stay fire");
2025 } elsif ($sym == SDLK_a) {
2026 $::CONN->user_send ("apply");
2027 } elsif ($sym == SDLK_QUOTE) {
2028 $self->emit ('activate_console');
2029 } elsif ($sym == SDLK_SLASH) {
2030 $self->emit ('activate_console' => '/');
2031 } elsif (exists $DIR{$sym}) {
2032 if ($mod & KMOD_SHIFT) {
2033 $self->{shft}++;
2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
2035 } elsif ($mod & KMOD_CTRL) {
2036 $self->{ctrl}++;
2037 $::CONN->user_send ("run $DIR{$sym}[0]");
2038 } else {
2039 $::CONN->user_send ("$DIR{$sym}[1]");
2040 }
2041 }
2042}
2043
2044sub key_up {
2045 my ($self, $ev) = @_;
2046
2047 my $mod = $ev->key_mod;
2048 my $sym = $ev->key_sym;
2049
2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051 $::CONN->user_send ("fire_stop");
2052 }
2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054 $::CONN->user_send ("run_stop");
2055 }
2056}
2057
2058#############################################################################
2059
2060package CFClient::UI::Animator; 2135package CFClient::UI::Animator;
2061 2136
2062use SDL::OpenGL; 2137use CFClient::OpenGL;
2063 2138
2064our @ISA = CFClient::UI::Bin::; 2139our @ISA = CFClient::UI::Bin::;
2065 2140
2066sub moveto { 2141sub moveto {
2067 my ($self, $x, $y) = @_; 2142 my ($self, $x, $y) = @_;
… …
2105 2180
2106sub new { 2181sub new {
2107 my $class = shift; 2182 my $class = shift;
2108 2183
2109 my $self = $class->SUPER::new ( 2184 my $self = $class->SUPER::new (
2110 state => 0, 2185 state => 0,
2111 connect_activate => \&toggle_flopper, 2186 connect_activate => \&toggle_flopper,
2112 @_ 2187 @_
2113 ); 2188 );
2114 2189
2115 if ($self->{state}) { 2190 if ($self->{state}) {
… …
2136 $self->emit (changed => $self->{state}); 2211 $self->emit (changed => $self->{state});
2137} 2212}
2138 2213
2139############################################################################# 2214#############################################################################
2140 2215
2216package CFClient::UI::Tooltip;
2217
2218our @ISA = CFClient::UI::Bin::;
2219
2220use CFClient::OpenGL;
2221
2222sub new {
2223 my $class = shift;
2224
2225 $class->SUPER::new (
2226 @_,
2227 can_events => 0,
2228 )
2229}
2230
2231sub set_markup {
2232 my ($self, $text) = @_;
2233
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2235 $self->{label}->set_markup ($text);
2236 $self->add ($self->{label});
2237}
2238
2239sub size_request {
2240 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245
2246 ($w + 4, $h + 4)
2247}
2248
2249sub size_allocate {
2250 my ($self, $w, $h) = @_;
2251
2252 $self->SUPER::size_allocate ($w - 4, $h - 4);
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375;
2260
2261 my ($w, $h) = @$self{qw(w h)};
2262
2263 glColor 1, 0.8, 0.4;
2264 glBegin GL_QUADS;
2265 glVertex 0 , 0;
2266 glVertex 0 , $h;
2267 glVertex $w, $h;
2268 glVertex $w, 0;
2269 glEnd;
2270
2271 glColor 0, 0, 0;
2272 glBegin GL_LINE_LOOP;
2273 glVertex 0 , 0;
2274 glVertex 0 , $h;
2275 glVertex $w, $h;
2276 glVertex $w, 0;
2277 glEnd;
2278
2279 glPopMatrix;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw;
2283}
2284
2285#############################################################################
2286
2287package CFClient::UI::Face;
2288
2289our @ISA = CFClient::UI::Base::;
2290
2291use CFClient::OpenGL;
2292
2293sub new {
2294 my $class = shift;
2295
2296 $class->SUPER::new (
2297 aspect => 1,
2298 @_,
2299 )
2300}
2301
2302sub size_request {
2303 (32, 8)
2304}
2305
2306sub draw {
2307 my ($self) = @_;
2308
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310
2311 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 }
2321}
2322
2323#############################################################################
2324
2141package CFClient::UI::Root; 2325package CFClient::UI::Root;
2142 2326
2143our @ISA = CFClient::UI::Container::; 2327our @ISA = CFClient::UI::Container::;
2144 2328
2145use SDL::OpenGL; 2329use CFClient::OpenGL;
2146 2330
2147sub check_size { 2331sub check_size {
2148 my ($self) = @_; 2332 my ($self) = @_;
2149 2333
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2335}
2152 2336
2153sub size_request { 2337sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2338 ($::WIDTH, $::HEIGHT)
2155} 2339}
… …
2157sub configure { 2341sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2342 my ($self, $x, $y, $w, $h) = @_;
2159 2343
2160 $self->SUPER::configure ($x, $y, $w, $h); 2344 $self->SUPER::configure ($x, $y, $w, $h);
2161 2345
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2346 for my $child (@{$self->{children}}) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2351 $child->configure ($X, $Y, $W,$H);
2352 }
2164} 2353}
2165 2354
2166sub _topleft { 2355sub _topleft {
2167 my ($self, $x, $y) = @_; 2356 my ($self, $x, $y) = @_;
2168 2357
… …
2176 ::refresh (); 2365 ::refresh ();
2177} 2366}
2178 2367
2179sub add { 2368sub add {
2180 my ($self, $child) = @_; 2369 my ($self, $child) = @_;
2370
2371 # integerize window positions
2372 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y};
2181 2374
2182 $self->SUPER::add ($child); 2375 $self->SUPER::add ($child);
2183} 2376}
2184 2377
2185sub on_refresh { 2378sub on_refresh {
… …
2211############################################################################# 2404#############################################################################
2212 2405
2213package CFClient::UI; 2406package CFClient::UI;
2214 2407
2215$ROOT = new CFClient::UI::Root; 2408$ROOT = new CFClient::UI::Root;
2409$TOOLTIP = new CFClient::UI::Tooltip;
2216 2410
22171 24111
2218 2412

Diff Legend

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