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

Diff Legend

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