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.167 by elmex, Mon Apr 24 08:44:23 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 (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
374 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
375 503
376 $self 504 $self
377} 505}
378 506
… …
386 $self->{children} = [ 514 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 515 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 516 @{$self->{children}}, $child
389 ]; 517 ];
390 518
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 519 $child->check_size;
394} 520}
395 521
396sub remove { 522sub remove {
397 my ($self, $widget) = @_; 523 my ($self, $child) = @_;
398 524
525 delete $child->{parent};
526 $child->hide;
527
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 529
401 $self->check_size; 530 $self->check_size;
531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
402} 544}
403 545
404sub find_widget { 546sub find_widget {
405 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
406 548
… …
436 578
437 $class->SUPER::new (children => [$child], %arg) 579 $class->SUPER::new (children => [$child], %arg)
438} 580}
439 581
440sub add { 582sub add {
441 my ($self, $widget) = @_; 583 my ($self, $child) = @_;
442 584
443 $self->{children} = []; 585 $self->{children} = [];
444 586
445 $self->SUPER::add ($widget); 587 $self->SUPER::add ($child);
446} 588}
447 589
448sub remove { 590sub remove {
449 my ($self, $widget) = @_; 591 my ($self, $widget) = @_;
450 592
… …
470 612
471package CFClient::UI::Window; 613package CFClient::UI::Window;
472 614
473our @ISA = CFClient::UI::Bin::; 615our @ISA = CFClient::UI::Bin::;
474 616
475use SDL::OpenGL; 617use CFClient::OpenGL;
476 618
477sub new { 619sub new {
478 my ($class, %arg) = @_; 620 my ($class, %arg) = @_;
479 621
480 my $self = $class->SUPER::new (%arg); 622 my $self = $class->SUPER::new (%arg);
… …
534sub new { die } 676sub new { die }
535 677
536sub size_request { 678sub size_request {
537 my ($self) = @_; 679 my ($self) = @_;
538 680
539 @$self{qw(child_w child_h)} = $self->child->size_request; 681 @$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)}); 682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 683
542 @$self{qw(child_w child_h)} 684 @$self{qw(child_w child_h)}
543} 685}
544 686
… …
553 695
554package CFClient::UI::Frame; 696package CFClient::UI::Frame;
555 697
556our @ISA = CFClient::UI::Bin::; 698our @ISA = CFClient::UI::Bin::;
557 699
558use SDL::OpenGL; 700use 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 701
606sub new { 702sub new {
607 my $class = shift; 703 my $class = shift;
608 704
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 705 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 706 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 707 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 708 border => 0.8,
615 @_ 709 @_
616 ) 710 );
711
712 $self
713}
714
715sub _draw {
716 my ($self) = @_;
717
718 my ($w, $h) = ($self->{w}, $self->{h});
719
720 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724
725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737}
738
739#############################################################################
740
741package CFClient::UI::FancyFrame;
742
743our @ISA = CFClient::UI::Bin::;
744
745use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750
751sub new {
752 my $class = shift;
753
754 # TODO: user_x, user_y, overwrite moveto?
755
756 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1],
759 border => 0.8,
760 can_events => 1,
761 @_
762 );
763
764 $self->{title} &&= new CFClient::UI::Label
765 align => 0,
766 valign => 1,
767 text => $self->{title},
768 fontsize => 1;
769
770 $self
771}
772
773sub border {
774 int $_[0]{border} * $::FONTSIZE
617} 775}
618 776
619sub size_request { 777sub size_request {
620 my ($self) = @_; 778 my ($self) = @_;
621 779
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624 my ($w, $h) = $self->SUPER::size_request; 780 my ($w, $h) = $self->SUPER::size_request;
625 781
626 ( 782 (
627 $w + $self->{border} * 2, 783 $w + $self->border * 2,
628 $h + $self->{border} * 2, 784 $h + $self->border * 2,
629 ) 785 )
630} 786}
631 787
632sub size_allocate { 788sub size_allocate {
633 my ($self, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
634 790
635 $h -= List::Util::max 0, $self->{border} * 2; 791 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 792 $w -= List::Util::max 0, $self->border * 2;
637 793
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 797 $self->child->configure ($self->border, $self->border, $w, $h);
639} 798}
640 799
641sub button_down { 800sub button_down {
642 my ($self, $ev, $x, $y) = @_; 801 my ($self, $ev, $x, $y) = @_;
643 802
803 my $border = $self->border;
804
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 805 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 806 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 807
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 808 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 809 my ($bw, $bh) = ($self->{w}, $self->{h});
649 810
650 $self->{motion} = sub { 811 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 812 my ($ev, $x, $y) = @_;
652 813
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 814 ($x, $y) = ($ev->{x}, $ev->{y});
654 815
655 $self->{user_w} = $bw + $x - $ox; 816 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 817 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 818 $self->check_size;
658 }; 819 };
659 820
660 } elsif ($x >= 0 && $x < $self->{w} 821 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 822 && $y >= 0 && $y < $border) {
662 823
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 824 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 825 my ($bx, $by) = ($self->{x}, $self->{y});
665 826
666 $self->{motion} = sub { 827 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 828 my ($ev, $x, $y) = @_;
668 829
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 830 ($x, $y) = ($ev->{x}, $ev->{y});
670 831
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 832 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 833 $self->update;
673 }; 834 };
674 } 835 }
… …
695 glEnable GL_BLEND; 856 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 860
861 my $border = $self->border;
862
700 glColor @{ $self->{border_bg} }; 863 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 864 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 865 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 867 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 868
706 my $bg = $tex[0]; 869 my $bg = $tex[0];
707 870
708 # TODO: repeat texture not scale 871 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 872 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 875 glColor @{ $self->{bg} };
713 876
714 $bg->{s} = $rep_x; 877 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 878 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 879 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 880 $bg->draw_quad ($border, $border, $cw, $ch);
718 881
719 glDisable GL_TEXTURE_2D; 882 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 883 glDisable GL_BLEND;
721 884
885 $self->{title}->draw if $self->{title};
722 $self->child->draw; 886 $self->child->draw;
723} 887}
724 888
725############################################################################# 889#############################################################################
726 890
… …
728 892
729our @ISA = CFClient::UI::Base::; 893our @ISA = CFClient::UI::Base::;
730 894
731use List::Util qw(max sum); 895use List::Util qw(max sum);
732 896
733use SDL::OpenGL; 897use CFClient::OpenGL;
734 898
735sub new { 899sub new {
736 my $class = shift; 900 my $class = shift;
737 901
738 $class->SUPER::new ( 902 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 909 my ($self, $x, $y, $child) = @_;
746 910
747 $child->set_parent ($self); 911 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 912 $self->{children}[$y][$x] = $child;
749 913
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 914 $child->check_size;
753} 915}
754 916
755# TODO: move to container class maybe? send childs a signal on removal? 917# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 918sub clear {
757 my ($self) = @_; 919 my ($self) = @_;
758 920
759 delete $self->{children}; 921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
760 $self->update; 928 $self->update;
761} 929}
762 930
763sub get_wh { 931sub get_wh {
764 my ($self) = @_; 932 my ($self) = @_;
… …
770 or next; 938 or next;
771 939
772 for my $x (0 .. $#$row) { 940 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 941 my $widget = $row->[$x]
774 or next; 942 or next;
775 my ($w, $h) = $widget->size_request; 943 my ($w, $h) = @$widget{qw(req_w req_h)};
776 944
777 $w[$x] = max $w[$x], $w; 945 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 946 $h[$y] = max $h[$y], $h;
779 } 947 }
780 } 948 }
… …
885 1053
886 ($h, $w) = ($w, $h); 1054 ($h, $w) = ($w, $h);
887 1055
888 my $children = $self->{children}; 1056 my $children = $self->{children};
889 1057
890 my @h = map +($_->size_request)[0], @$children; 1058 my @h = map $_->{req_w}, @$children;
891 1059
892 my $req_h = List::Util::sum @h; 1060 my $req_h = List::Util::sum @h;
893 1061
894 if ($req_h > $h) { 1062 if ($req_h > $h) {
895 # ah well, not enough space 1063 # ah well, not enough space
… …
943sub size_allocate { 1111sub size_allocate {
944 my ($self, $w, $h) = @_; 1112 my ($self, $w, $h) = @_;
945 1113
946 my $children = $self->{children}; 1114 my $children = $self->{children};
947 1115
948 my @h = map +($_->size_request)[1], @$children; 1116 my @h = map $_->{req_h}, @$children;
949 1117
950 my $req_h = List::Util::sum @h; 1118 my $req_h = List::Util::sum @h;
951 1119
952 if ($req_h > $h) { 1120 if ($req_h > $h) {
953 # ah well, not enough space 1121 # ah well, not enough space
… …
981 1149
982package CFClient::UI::Label; 1150package CFClient::UI::Label;
983 1151
984our @ISA = CFClient::UI::Base::; 1152our @ISA = CFClient::UI::Base::;
985 1153
986use SDL::OpenGL; 1154use CFClient::OpenGL;
987 1155
988sub new { 1156sub new {
989 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
990 1158
991 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1161 #font => default_font
1162 fontsize => 1,
994 text => "", 1163 text => "",
995 align => -1, 1164 align => -1,
996 valign => -1, 1165 valign => -1,
997 padding => 2, 1166 padding => 2,
998 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1168 can_events => 0,
999 %arg 1169 %arg
1000 ); 1170 );
1001 1171
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1172 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout;
1176 }
1003 1177
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1178 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1180
1007 $self 1181 $self
1008} 1182}
1009 1183
1010sub escape_text { 1184sub escape {
1011 local $_ = $_[1]; 1185 local $_ = $_[1];
1012 1186
1013 s/&/&amp;/g; 1187 s/&/&amp;/g;
1014 s/>/&gt;/g; 1188 s/>/&gt;/g;
1015 s/</&lt;/g; 1189 s/</&lt;/g;
… …
1021 my ($self, $text) = @_; 1195 my ($self, $text) = @_;
1022 1196
1023 $self->{layout}->set_text ($text); 1197 $self->{layout}->set_text ($text);
1024 1198
1025 delete $self->{texture}; 1199 delete $self->{texture};
1200 $self->check_size;
1026 $self->update; 1201 $self->update;
1027} 1202}
1028 1203
1029sub set_markup { 1204sub set_markup {
1030 my ($self, $markup) = @_; 1205 my ($self, $markup) = @_;
1031 1206
1032 $self->{layout}->set_markup ($markup); 1207 $self->{layout}->set_markup ($markup);
1033 1208
1034 delete $self->{texture}; 1209 delete $self->{texture};
1210 $self->check_size;
1035 $self->update; 1211 $self->update;
1036} 1212}
1037 1213
1038sub size_request { 1214sub size_request {
1039 my ($self) = @_; 1215 my ($self) = @_;
1040 1216
1041 $self->{layout}->set_width; 1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
1042 $self->{layout}->set_height ($self->{fontsize}); 1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1220
1044 my ($w, $h) = $self->{layout}->size; 1221 my ($w, $h) = $self->{layout}->size;
1222
1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226
1227 my ($w2, $h2) = $self->{template}->size;
1228
1229 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2;
1231 }
1045 1232
1046 ( 1233 (
1047 $w + $self->{padding} * 2, 1234 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1235 $h + $self->{padding} * 2,
1049 ) 1236 )
… …
1053 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h) = @_;
1054 1241
1055 delete $self->{texture}; 1242 delete $self->{texture};
1056} 1243}
1057 1244
1058sub update { 1245sub set_fontsize {
1059 my ($self) = @_; 1246 my ($self, $fontsize) = @_;
1060 1247
1248 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1249 delete $self->{texture};
1250 $self->check_size;
1062 $self->SUPER::update; 1251 $self->update;
1063} 1252}
1064 1253
1065sub _draw { 1254sub _draw {
1066 my ($self) = @_; 1255 my ($self) = @_;
1067 1256
1068 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
1069 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1262 };
1073 1263
1074 glEnable GL_BLEND; 1264 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1290
1101package CFClient::UI::EntryBase; 1291package CFClient::UI::EntryBase;
1102 1292
1103our @ISA = CFClient::UI::Label::; 1293our @ISA = CFClient::UI::Label::;
1104 1294
1105use SDL; 1295use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1296
1108sub new { 1297sub new {
1109 my $class = shift; 1298 my $class = shift;
1110 1299
1111 $class->SUPER::new ( 1300 $class->SUPER::new (
1112 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1113 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1114 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1116 can_hover => 1, 1305 can_hover => 1,
1117 can_focus => 1, 1306 can_focus => 1,
1118 valign => 0, 1307 valign => 0,
1308 can_events => 1,
1119 @_ 1309 @_
1120 ) 1310 )
1121} 1311}
1122 1312
1123sub _set_text { 1313sub _set_text {
… …
1125 1315
1126 delete $self->{cur_h}; 1316 delete $self->{cur_h};
1127 1317
1128 return if $self->{text} eq $text; 1318 return if $self->{text} eq $text;
1129 1319
1320 delete $self->{texture};
1321
1130 $self->{last_activity} = $::NOW; 1322 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1323 $self->{text} = $text;
1132 1324
1133 $text =~ s/./*/g if $self->{hidden}; 1325 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1326 $self->{layout}->set_text ("$text ");
… …
1149} 1341}
1150 1342
1151sub size_allocate { 1343sub size_allocate {
1152 my ($self, $w, $h) = @_; 1344 my ($self, $w, $h) = @_;
1153 1345
1154 $self->_set_text ($self->{text}); 1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1347}
1156 1348
1157sub set_text { 1349sub set_text {
1158 my ($self, $text) = @_; 1350 my ($self, $text) = @_;
1159 1351
… …
1163} 1355}
1164 1356
1165sub key_down { 1357sub key_down {
1166 my ($self, $ev) = @_; 1358 my ($self, $ev) = @_;
1167 1359
1168 my $mod = $ev->key_mod; 1360 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1361 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1362 my $uni = $ev->{unicode};
1172 1363
1173 my $text = $self->get_text; 1364 my $text = $self->get_text;
1174 1365
1175 if ($sym == SDLK_BACKSPACE) { 1366 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1368 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1369 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1370 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1371 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1372 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1373 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1374 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1375 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1376 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1377 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1378 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1379 $self->emit ('escape');
1189 } elsif ($uni) { 1380 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1381 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1382 }
1192 1383
… …
1267 1458
1268package CFClient::UI::Entry; 1459package CFClient::UI::Entry;
1269 1460
1270our @ISA = CFClient::UI::EntryBase::; 1461our @ISA = CFClient::UI::EntryBase::;
1271 1462
1272use SDL; 1463use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1464
1275sub key_down { 1465sub key_down {
1276 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1277 1467
1278 my $sym = $ev->key_sym; 1468 my $sym = $ev->{sym};
1279 1469
1280 if ($sym == SDLK_RETURN) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1281 $self->emit (activate => $self->get_text); 1474 $self->emit (activate => $txt);
1282 $self->update; 1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1283 1496
1284 } else { 1497 } else {
1285 $self->SUPER::key_down ($ev); 1498 $self->SUPER::key_down ($ev);
1286 } 1499 }
1287 1500
… …
1291 1504
1292package CFClient::UI::Button; 1505package CFClient::UI::Button;
1293 1506
1294our @ISA = CFClient::UI::Label::; 1507our @ISA = CFClient::UI::Label::;
1295 1508
1296use SDL; 1509use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1510
1299my @tex = 1511my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1512 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1513 qw(b1_button_active.png);
1302 1514
1303sub new { 1515sub new {
1304 my $class = shift; 1516 my $class = shift;
1305 1517
1306 $class->SUPER::new ( 1518 $class->SUPER::new (
1307 padding => 4, 1519 padding => 4,
1308 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1309 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1522 active_fg => [0, 0, 1],
1311 can_hover => 1, 1523 can_hover => 1,
1312 align => 0, 1524 align => 0,
1313 valign => 0, 1525 valign => 0,
1526 can_events => 1,
1314 @_ 1527 @_
1315 ) 1528 )
1316} 1529}
1317 1530
1318sub button_up { 1531sub button_up {
… …
1352package CFClient::UI::CheckBox; 1565package CFClient::UI::CheckBox;
1353 1566
1354our @ISA = CFClient::UI::DrawBG::; 1567our @ISA = CFClient::UI::DrawBG::;
1355 1568
1356my @tex = 1569my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1571 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1572
1360use SDL; 1573use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1574
1363sub new { 1575sub new {
1364 my $class = shift; 1576 my $class = shift;
1365 1577
1366 $class->SUPER::new ( 1578 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1624 glDisable GL_BLEND;
1413} 1625}
1414 1626
1415############################################################################# 1627#############################################################################
1416 1628
1417package CFClient::UI::VGauge; 1629package CFClient::UI::Image;
1418 1630
1419our @ISA = CFClient::UI::Base::; 1631our @ISA = CFClient::UI::Base::;
1420 1632
1421use SDL::OpenGL; 1633use CFClient::OpenGL;
1634use Carp qw/confess/;
1422 1635
1423my %tex = ( 1636our %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 1637
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1638sub new {
1444 my $class = shift; 1639 my $class = shift;
1445 1640
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1641 my $self = $class->SUPER::new (can_events => 0, @_);
1642
1643 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1644
1645 $loaded_images{$self->{image}} ||=
1646 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1647
1648 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1649
1650 Scalar::Util::weaken $loaded_images{$self->{image}};
1651
1652 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1653
1448 $self 1654 $self
1449} 1655}
1450 1656
1451sub size_request { 1657sub size_request {
1452 my ($self) = @_; 1658 my ($self) = @_;
1453 1659
1454 my $tex = $tex{$self->{gauge}}[0]; 1660 ($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} 1661}
1476 1662
1477sub _draw { 1663sub _draw {
1478 my ($self) = @_; 1664 my ($self) = @_;
1479 1665
1480 my $tex = $tex{$self->{gauge}}; 1666 my $tex = $self->{tex};
1481 1667
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1668 my ($w, $h) = ($self->{w}, $self->{h});
1483 1669
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1670 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1671 glRotate 90, 0, 0, 1;
1672 glTranslate 0, -$self->{w}, 0;
1486 1673
1487 my $t1 = $tex->[0]; 1674 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1675 }
1489 1676
1490 glEnable GL_BLEND; 1677 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1679 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1681
1682 $tex->draw_quad (0, 0, $w, $h);
1683
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D;
1686}
1687
1688#############################################################################
1689
1690package CFClient::UI::VGauge;
1691
1692our @ISA = CFClient::UI::Base::;
1693
1694use List::Util qw(min max);
1695
1696use CFClient::OpenGL;
1697
1698my %tex = (
1699 food => [
1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1701 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1702 ],
1703 grace => [
1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1705 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1706 ],
1707 hp => [
1708 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1709 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1710 ],
1711 mana => [
1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1713 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1714 ],
1715);
1716
1717# eg. VGauge->new (gauge => 'food'), default gauge: food
1718sub new {
1719 my $class = shift;
1720
1721 my $self = $class->SUPER::new (
1722 type => 'food',
1723 @_
1724 );
1725
1726 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1727
1728 $self
1729}
1730
1731sub size_request {
1732 my ($self) = @_;
1733
1734 #my $tex = $tex{$self->{type}}[0];
1735 #@$tex{qw(w h)}
1736 (0, 0)
1737}
1738
1739sub set_max {
1740 my ($self, $max) = @_;
1741
1742 $self->{max_val} = $max;
1743}
1744
1745sub set_value {
1746 my ($self, $val, $max) = @_;
1747
1748 $self->set_max ($max)
1749 if defined $max;
1750
1751 $max = $self->{max_val};
1752 $self->{val} = $val;
1753
1754 $self->update;
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 my $tex = $tex{$self->{type}};
1761 my ($t1, $t2, $t3) = @$tex;
1762
1763 my ($w, $h) = ($self->{w}, $self->{h});
1764
1765 if ($self->{vertical}) {
1766 glRotate 90, 0, 0, 1;
1767 glTranslate 0, -$self->{w}, 0;
1768
1769 ($w, $h) = ($h, $w);
1770 }
1771
1772 my $ycut = $self->{val} / ($self->{max_val} || 1);
1773
1774 my $ycut1 = max 0, min 1, $ycut;
1775 my $ycut2 = max 0, min 1, $ycut - 1;
1776
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1777 my $h1 = $self->{h} * (1 - $ycut1);
1496 my $h2 = $ycut * $self->{h}; 1778 my $h2 = $self->{h} * (1 - $ycut2);
1497 1779
1498 my $yp = 0; 1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 1784
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1785 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1786 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1787 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1788 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1789 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1790 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1791 glEnd;
1507 1792
1508 $yp += $h1; 1793 my $ycut1 = List::Util::min 1, $ycut;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1794 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1795 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1796 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1797 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; 1798 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1799 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516 glEnd; 1800 glEnd;
1801
1802 if ($t3) {
1803 glBindTexture GL_TEXTURE_2D, $t3->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1806 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1807 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1808 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1809 glEnd;
1810 }
1517 1811
1518 glDisable GL_BLEND; 1812 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1813 glDisable GL_TEXTURE_2D;
1520} 1814}
1521 1815
1522############################################################################# 1816#############################################################################
1523 1817
1818package CFClient::UI::Gauge;
1819
1820our @ISA = CFClient::UI::VBox::;
1821
1822sub new {
1823 my ($class, %arg) = @_;
1824
1825 my $self = $class->SUPER::new (
1826 tooltip => $arg{type},
1827 can_hover => 1,
1828 %arg,
1829 );
1830
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1834
1835 $self
1836}
1837
1838sub set_fontsize {
1839 my ($self, $fsize) = @_;
1840
1841 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize);
1843}
1844
1845sub set_value {
1846 my ($self, $val, $max) = @_;
1847
1848 $self->set_max ($max)
1849 if defined $max;
1850
1851 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860}
1861
1862#############################################################################
1863
1524package CFClient::UI::Slider; 1864package CFClient::UI::Slider;
1525 1865
1526use strict; 1866use strict;
1527 1867
1528use SDL::OpenGL; 1868use CFClient::OpenGL;
1529 1869
1530our @ISA = CFClient::UI::DrawBG::; 1870our @ISA = CFClient::UI::DrawBG::;
1531 1871
1532my @tex = 1872my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1883 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1884 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1885 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1886 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1887 range => [0, 0, 100, 10],
1548 req_w => 40, 1888 req_w => 20,
1549 req_h => 13, 1889 req_h => 20,
1550 vertical => 0, 1890 vertical => 0,
1551 can_hover => 1, 1891 can_hover => 1,
1552 inner_pad => 5, 1892 inner_pad => 5,
1553 @_ 1893 @_
1554 ); 1894 );
… …
1658 1998
1659package CFClient::UI::TextView; 1999package CFClient::UI::TextView;
1660 2000
1661our @ISA = CFClient::UI::HBox::; 2001our @ISA = CFClient::UI::HBox::;
1662 2002
1663use SDL::OpenGL; 2003use CFClient::OpenGL;
1664 2004
1665sub new { 2005sub new {
1666 my $class = shift; 2006 my $class = shift;
1667 2007
1668 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6, 2009 fontsize => 1,
1670 req_h => $::HEIGHT / 6, 2010 can_events => 0,
1671 fontsize => $::FONTSIZE, 2011 #font => default_font
1672 @_, 2012 @_,
1673 2013
1674 layout => (new CFClient::Layout), 2014 layout => (new CFClient::Layout),
1675 par => [], 2015 par => [],
1676 height => 0, 2016 height => 0,
1677 children => [ 2017 children => [
1678 (new CFClient::UI::Empty expand => 1), 2018 (new CFClient::UI::Empty expand => 1),
1679 (new CFClient::UI::Slider vertical => 1), 2019 (new CFClient::UI::Slider vertical => 1),
1680 ], 2020 ],
1681 ); 2021 );
1682 2022
… …
1697sub text_height { 2037sub text_height {
1698 my ($self, $text) = @_; 2038 my ($self, $text) = @_;
1699 2039
1700 my $layout = $self->{layout}; 2040 my $layout = $self->{layout};
1701 2041
1702 $layout->set_height ($self->{fontsize}); 2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 2043 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 2044 $layout->set_text ($text);
1705 2045
1706 ($layout->size)[1] 2046 ($layout->size)[1]
1707} 2047}
… …
1711 2051
1712 $self->{need_reflow}++; 2052 $self->{need_reflow}++;
1713 $self->update; 2053 $self->update;
1714} 2054}
1715 2055
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 2056sub size_allocate {
1723 my ($self, $w, $h) = @_; 2057 my ($self, $w, $h) = @_;
1724 2058
2059 $self->SUPER::size_allocate ($w, $h);
2060
2061 $self->{layout}->set_font ($self->{font}) if $self->{font};
1725 $self->{layout}->set_height ($self->{fontsize}); 2062 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 2063 $self->{layout}->set_width ($self->{children}[0]{w});
1727 2064
1728 $self->reflow; 2065 $self->reflow;
1729 $self->update;
1730} 2066}
1731 2067
1732sub add_paragraph { 2068sub add_paragraph {
1733 my ($self, $color, $text) = @_; 2069 my ($self, $color, $text) = @_;
1734 2070
… …
1782 my $y1 = $top + $self->{h}; 2118 my $y1 = $top + $self->{h};
1783 2119
1784 my $y = 0; 2120 my $y = 0;
1785 2121
1786 my $layout = $self->{layout}; 2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
1787 2125
1788 for my $par (@{$self->{par}}) { 2126 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2127 my $h = $par->[0];
1790 2128
1791 if ($y0 < $y + $h && $y < $y1) { 2129 if ($y0 < $y + $h && $y < $y1) {
… …
1819 2157
1820} 2158}
1821 2159
1822############################################################################# 2160#############################################################################
1823 2161
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; 2162package CFClient::UI::Animator;
2061 2163
2062use SDL::OpenGL; 2164use CFClient::OpenGL;
2063 2165
2064our @ISA = CFClient::UI::Bin::; 2166our @ISA = CFClient::UI::Bin::;
2065 2167
2066sub moveto { 2168sub moveto {
2067 my ($self, $x, $y) = @_; 2169 my ($self, $x, $y) = @_;
… …
2105 2207
2106sub new { 2208sub new {
2107 my $class = shift; 2209 my $class = shift;
2108 2210
2109 my $self = $class->SUPER::new ( 2211 my $self = $class->SUPER::new (
2110 state => 0, 2212 state => 0,
2111 connect_activate => \&toggle_flopper, 2213 connect_activate => \&toggle_flopper,
2112 @_ 2214 @_
2113 ); 2215 );
2114 2216
2115 if ($self->{state}) { 2217 if ($self->{state}) {
… …
2136 $self->emit (changed => $self->{state}); 2238 $self->emit (changed => $self->{state});
2137} 2239}
2138 2240
2139############################################################################# 2241#############################################################################
2140 2242
2243package CFClient::UI::Tooltip;
2244
2245our @ISA = CFClient::UI::Bin::;
2246
2247use CFClient::OpenGL;
2248
2249sub new {
2250 my $class = shift;
2251
2252 $class->SUPER::new (
2253 @_,
2254 can_events => 0,
2255 )
2256}
2257
2258sub set_markup {
2259 my ($self, $text) = @_;
2260
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2262 $self->{label}->set_markup ($text);
2263 $self->add ($self->{label});
2264}
2265
2266sub size_request {
2267 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272
2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375;
2287
2288 my ($w, $h) = @$self{qw(w h)};
2289
2290 glColor 1, 0.8, 0.4;
2291 glBegin GL_QUADS;
2292 glVertex 0 , 0;
2293 glVertex 0 , $h;
2294 glVertex $w, $h;
2295 glVertex $w, 0;
2296 glEnd;
2297
2298 glColor 0, 0, 0;
2299 glBegin GL_LINE_LOOP;
2300 glVertex 0 , 0;
2301 glVertex 0 , $h;
2302 glVertex $w, $h;
2303 glVertex $w, 0;
2304 glEnd;
2305
2306 glPopMatrix;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw;
2310}
2311
2312#############################################################################
2313
2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
2141package CFClient::UI::Root; 2352package CFClient::UI::Root;
2142 2353
2143our @ISA = CFClient::UI::Container::; 2354our @ISA = CFClient::UI::Container::;
2144 2355
2145use SDL::OpenGL; 2356use CFClient::OpenGL;
2146 2357
2147sub check_size { 2358sub check_size {
2148 my ($self) = @_; 2359 my ($self) = @_;
2149 2360
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2362}
2152 2363
2153sub size_request { 2364sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2365 ($::WIDTH, $::HEIGHT)
2155} 2366}
… …
2157sub configure { 2368sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2369 my ($self, $x, $y, $w, $h) = @_;
2159 2370
2160 $self->SUPER::configure ($x, $y, $w, $h); 2371 $self->SUPER::configure ($x, $y, $w, $h);
2161 2372
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2373 for my $child (@{$self->{children}}) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H);
2379 }
2164} 2380}
2165 2381
2166sub _topleft { 2382sub _topleft {
2167 my ($self, $x, $y) = @_; 2383 my ($self, $x, $y) = @_;
2168 2384
… …
2176 ::refresh (); 2392 ::refresh ();
2177} 2393}
2178 2394
2179sub add { 2395sub add {
2180 my ($self, $child) = @_; 2396 my ($self, $child) = @_;
2397
2398 # integerize window positions
2399 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y};
2181 2401
2182 $self->SUPER::add ($child); 2402 $self->SUPER::add ($child);
2183} 2403}
2184 2404
2185sub on_refresh { 2405sub on_refresh {
… …
2211############################################################################# 2431#############################################################################
2212 2432
2213package CFClient::UI; 2433package CFClient::UI;
2214 2434
2215$ROOT = new CFClient::UI::Root; 2435$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip;
2216 2437
22171 24381
2218 2439

Diff Legend

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