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.75 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.125 by root, Mon Apr 17 20:52:15 2006 UTC

7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
79use SDL::OpenGL; 92use SDL::OpenGL;
80 93
81sub new { 94sub new {
82 my $class = shift; 95 my $class = shift;
83 96
84 bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1, 101 w => -1,
89 h => -1, 102 h => -1,
90 @_ 103 @_
91 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
92} 113}
93 114
94sub move { 115sub move {
95 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 117 $self->{x} = int $x;
97 $self->{y} = $y; 118 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
99} 120}
100 121
101sub needs_redraw { 122sub needs_redraw {
102 0 123 0
125 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
126 147
127 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
128} 149}
129 150
130# translate global koordinates to local coordinate system 151# return top left coordinates
131sub translate { 152sub _topleft {
132 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
133 154
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
135} 172}
136 173
137sub focus_in { 174sub focus_in {
138 my ($self) = @_; 175 my ($self) = @_;
139 176
140 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
141 179
142 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
181
182 $self->emit (focus_in => $focus);
183
143 $focus->update if $focus; 184 $focus->update if $focus;
144 $FOCUS->update; 185 $FOCUS->update;
145} 186}
146 187
147sub focus_out { 188sub focus_out {
148 my ($self) = @_; 189 my ($self) = @_;
149 190
150 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
151 192
152 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
153 $focus->update if $focus; #? 197 $focus->update if $focus; #?
154} 198}
155 199
156sub mouse_motion { } 200sub mouse_motion { }
157sub button_up { } 201sub button_up { }
178 glPushMatrix; 222 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 223 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 224 $self->_draw;
181 glPopMatrix; 225 glPopMatrix;
182 226
183 if ($self == $HOVER) { 227 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 228 my ($x, $y) = @$self{qw(x y)};
185 229
186 glColor 1, 1, 1, 0.1; 230 glColor 1, 0.8, 0.5, 0.2;
187 glEnable GL_BLEND; 231 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 233 glBegin GL_QUADS;
190 glVertex $x , $y; 234 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 235 glVertex $x + $self->{w}, $y;
200 my ($self) = @_; 244 my ($self) = @_;
201 245
202 warn "no draw defined for $self\n"; 246 warn "no draw defined for $self\n";
203} 247}
204 248
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214}
215
216sub find_widget { 249sub find_widget {
217 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
218 251
219 return $self 252 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 253 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 254 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 255
223 () 256 ()
224} 257}
225 258
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 259sub set_parent {
229 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
230 261
231 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
233} 263}
234 264
235sub get_parent { 265sub check_size {
236 $_[0]->{parent} 266 my ($self) = @_;
267
268 my ($w, $h) = $self->size_request;
269
270 if ($w != $self->{req_w} || $h != $self->{req_h}) {
271 $self->{req_w} = $w;
272 $self->{req_h} = $h;
273
274 $self->{parent}->check_size
275 if $self->{parent};
276 }
237} 277}
238 278
239sub update { 279sub update {
240 my ($self) = @_; 280 my ($self) = @_;
241 281
275 my $class = shift; 315 my $class = shift;
276 316
277 # range [value, low, high, page] 317 # range [value, low, high, page]
278 318
279 $class->SUPER::new ( 319 $class->SUPER::new (
280 bg => [0, 0, 0, 0.4], 320 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 321 active_bg => [1, 1, 1, 0.5],
282 @_ 322 @_
283 ) 323 )
284} 324}
285 325
286sub _draw { 326sub _draw {
287 my ($self) = @_; 327 my ($self) = @_;
288 328
289 my ($w, $h) = @$self{qw(w h)}; 329 my ($w, $h) = @$self{qw(w h)};
290 330
331 glEnable GL_BLEND;
332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
291 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 333 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
334
292 glBegin GL_QUADS; 335 glBegin GL_QUADS;
293 glVertex 0 , 0; 336 glVertex 0 , 0;
294 glVertex 0 , $h; 337 glVertex 0 , $h;
295 glVertex $w, $h; 338 glVertex $w, $h;
296 glVertex $w, 0; 339 glVertex $w, 0;
297 glEnd; 340 glEnd;
341
342 glDisable GL_BLEND;
298} 343}
299 344
300############################################################################# 345#############################################################################
301 346
302package CFClient::UI::Empty; 347package CFClient::UI::Empty;
325 370
326 $self 371 $self
327} 372}
328 373
329sub add { 374sub add {
330 my ($self, $chld, $expand) = @_; 375 my ($self, $child) = @_;
331 376
332 $chld->{expand} = $expand;
333 $chld->set_parent ($self); 377 $child->set_parent ($self);
378
379 use sort 'stable';
334 380
335 $self->{children} = [ 381 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 382 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 383 @{$self->{children}}, $child
338 ]; 384 ];
339 385
340 $self->{w} = $self->{h} = -1; 386 $self->{w} = $self->{h} = -1;
341 $self->update; 387 $self->update;
342} 388}
344sub remove { 390sub remove {
345 my ($self, $widget) = @_; 391 my ($self, $widget) = @_;
346 392
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 393 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348 394
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 395 $self->check_size;
350} 396}
351 397
352sub find_widget { 398sub find_widget {
353 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
354 400
439} 485}
440 486
441sub render_chld { 487sub render_chld {
442 my ($self) = @_; 488 my ($self) = @_;
443 489
444 $self->{texture} = 490 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 491 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 492 glClear GL_COLOR_BUFFER_BIT;
447 ); 493 $self->child->draw;
494 };
448} 495}
449 496
450sub size_allocate { 497sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
452 499
473 $tex->draw_quad (0, 0, $w, $h); 520 $tex->draw_quad (0, 0, $w, $h);
474 521
475 glDisable GL_BLEND; 522 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D; 523 glDisable GL_TEXTURE_2D;
477} 524}
525
526#############################################################################
527
528package CFClient::UI::ViewPort;
529
530our @ISA = CFClient::UI::Window::;
531
532sub new { die }
533
534sub size_request {
535 my ($self) = @_;
536
537 @$self{qw(child_w child_h)} = $self->child->size_request;
538 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
539
540 @$self{qw(child_w child_h)}
541}
542
543sub size_allocate {
544 my ($self, $x, $y, $w, $h) = @_;
545
546 $self->_size_allocate ($x, $y, $w, $h) or return;
547}
548
549sub _draw {
550 my ($self) = @_;
551
552 $self->{children}[1]->draw;
553}
554
478 555
479############################################################################# 556#############################################################################
480 557
481package CFClient::UI::Frame; 558package CFClient::UI::Frame;
482 559
530 607
531my @tex = 608my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 610 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534 611
612sub new {
613 my $class = shift;
614
615 # TODO: user_x, user_y, overwrite moveto?
616
617 $class->SUPER::new (
618 bg => [1, 1, 1, 1],
619 border_bg => [1, 1, 1, 1],
620 border => int $::FONTSIZE * 0.8,
621 @_
622 )
623}
624
535sub size_request { 625sub size_request {
536 my ($self) = @_; 626 my ($self) = @_;
537 627
628 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
629
538 my ($w, $h) = $self->SUPER::size_request; 630 my ($w, $h) = $self->SUPER::size_request;
539 631
540 $h += $tex[1]->{h}; 632 (
541 $h += $tex[4]->{h}; 633 $w + $self->{border} * 2,
542 $w += $tex[2]->{w}; 634 $h + $self->{border} * 2,
543 $w += $tex[3]->{w}; 635 )
544
545 ($w, $h)
546} 636}
547 637
548sub size_allocate { 638sub size_allocate {
549 my ($self, $x, $y, $w, $h) = @_; 639 my ($self, $x, $y, $w, $h) = @_;
550 640
551 $self->_size_allocate ($x, $y, $w, $h) or return; 641 $self->_size_allocate ($x, $y, $w, $h) or return;
552 642
553 $h -= $tex[1]->{h}; 643 $h -= List::Util::max 0, $self->{border} * 2;
554 $h -= $tex[4]->{h}; 644 $w -= List::Util::max 0, $self->{border} * 2;
555 $w -= $tex[2]->{w};
556 $w -= $tex[3]->{w};
557 645
558 $h = $h < 0 ? 0 : $h; 646 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
559 $w = $w < 0 ? 0 : $w; 647}
560 648
561 my $child = $self->child; 649sub button_down {
650 my ($self, $ev, $x, $y) = @_;
562 651
563 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 652 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
653 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
654
655 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
656 my ($bw, $bh) = ($self->{w}, $self->{h});
657
658 $self->{motion} = sub {
659 my ($ev, $x, $y) = @_;
660
661 ($x, $y) = ($ev->motion_x, $ev->motion_y);
662
663 $self->{user_w} = $bw + $x - $ox;
664 $self->{user_h} = $bh + $y - $oy;
665 $self->update;
666 };
667
668 } elsif ($x >= 0 && $x < $self->{w}
669 && $y >= 0 && $y < $self->{border}) {
670
671 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
672 my ($bx, $by) = ($self->{x}, $self->{y});
673
674 $self->{motion} = sub {
675 my ($ev, $x, $y) = @_;
676
677 ($x, $y) = ($ev->motion_x, $ev->motion_y);
678
679 $self->move ($bx + $x - $ox, $by + $y - $oy);
680 $self->update;
681 };
682 }
683}
684
685sub button_up {
686 my ($self, $ev, $x, $y) = @_;
687
688 delete $self->{motion};
689}
690
691sub mouse_motion {
692 my ($self, $ev, $x, $y) = @_;
693
694 $self->{motion}->($ev, $x, $y) if $self->{motion};
564} 695}
565 696
566sub _draw { 697sub _draw {
567 my ($self) = @_; 698 my ($self) = @_;
568 699
569 my ($w, $h) = ($self->{w}, $self->{h}); 700 my ($w, $h ) = ($self->{w}, $self->{h});
570 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 701 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
571 702
572 glEnable GL_BLEND; 703 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
574 glEnable GL_TEXTURE_2D; 705 glEnable GL_TEXTURE_2D;
575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
576 707
577 my $top = $tex[1]; 708 glColor @{ $self->{border_bg} };
578 $top->draw_quad (0, 0, $w, $top->{h}); 709 $tex[1]->draw_quad (0, 0, $w, $self->{border});
579 710 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
580 my $left = $tex[3]; 711 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
581 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 712 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
582
583 my $right = $tex[2];
584 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
585
586 my $bottom = $tex[4];
587 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
588 713
589 my $bg = $tex[0]; 714 my $bg = $tex[0];
590 glBindTexture GL_TEXTURE_2D, $bg->{name};
591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
592 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
593 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
594 715
716 # TODO: repeat texture not scale
595 my $rep_x = $cw / $bg->{w}; 717 my $rep_x = $cw / $bg->{w};
596 my $rep_y = $ch / $bg->{h}; 718 my $rep_y = $ch / $bg->{h};
597 719
720 glColor @{ $self->{bg} };
721
722 $bg->{s} = $rep_x;
723 $bg->{t} = $rep_y;
724 $bg->{wrap_mode} = 1;
598 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 725 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
599 726
727 glDisable GL_TEXTURE_2D;
600 glDisable GL_BLEND; 728 glDisable GL_BLEND;
601 glDisable GL_TEXTURE_2D;
602 729
603 $self->child->draw; 730 $self->child->draw;
604
605} 731}
606 732
607############################################################################# 733#############################################################################
608 734
609package CFClient::UI::Table; 735package CFClient::UI::Table;
612 738
613use List::Util qw(max sum); 739use List::Util qw(max sum);
614 740
615use SDL::OpenGL; 741use SDL::OpenGL;
616 742
743sub new {
744 my $class = shift;
745
746 $class->SUPER::new (
747 col_expand => [],
748 @_
749 )
750}
751
617sub add { 752sub add {
618 my ($self, $x, $y, $chld) = @_; 753 my ($self, $x, $y, $child) = @_;
619 754
755 $child->set_parent ($self);
620 $self->{children}[$y][$x] = $chld; 756 $self->{children}[$y][$x] = $child;
621 $chld->set_parent ($self);
622 757
623 $self->{w} = $self->{h} = -1; 758 $self->{w} = $self->{h} = -1;
759 $self->update;
760}
761
762# TODO: move to container class maybe? send childs a signal on removal?
763sub clear {
764 my ($self) = @_;
765
766 delete $self->{children};
624 $self->update; 767 $self->update;
625} 768}
626 769
627sub get_wh { 770sub get_wh {
628 my ($self) = @_; 771 my ($self) = @_;
650 my ($self) = @_; 793 my ($self) = @_;
651 794
652 my ($ws, $hs) = $self->get_wh; 795 my ($ws, $hs) = $self->get_wh;
653 796
654 ( 797 (
655 (List::Util::sum @$ws), 798 (sum @$ws),
656 (List::Util::sum @$hs), 799 (sum @$hs),
657 ) 800 )
658} 801}
659 802
660sub size_allocate { 803sub size_allocate {
661 my ($self, $x, $y, $w, $h) = @_; 804 my ($self, $x, $y, $w, $h) = @_;
662 805
663 $self->_size_allocate ($x, $y, $w, $h) or return; 806 $self->_size_allocate ($x, $y, $w, $h) or return;
664 807
665 my ($ws, $hs) = $self->get_wh; 808 my ($ws, $hs) = $self->get_wh;
666 809
667 my $req_w = List::Util::sum @$ws; 810 my $req_w = sum @$ws;
668 my $req_h = List::Util::sum @$hs; 811 my $req_h = sum @$hs;
812
813 # TODO: nicer code && do row_expand
814 my @col_expand = @{$self->{col_expand}};
815 @col_expand = (1) x @$ws unless @col_expand;
816 my $col_expand = (sum @col_expand) || 1;
669 817
670 # linearly scale sizes 818 # linearly scale sizes
671 $_ *= $req_w / $w for @$ws; 819 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
672 $_ *= $req_h / $h for @$hs; 820 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
821
822 CFClient::UI::harmonize $ws;
823 CFClient::UI::harmonize $hs;
673 824
674 my $y; 825 my $y;
675 826
676 for my $r (0 .. $#{$self->{children}}) { 827 for my $r (0 .. $#{$self->{children}}) {
677 my $row = $self->{children}[$r] 828 my $row = $self->{children}[$r]
679 830
680 my $x = 0; 831 my $x = 0;
681 my $row_h = $hs->[$r]; 832 my $row_h = $hs->[$r];
682 833
683 for my $c (0 .. $#$row) { 834 for my $c (0 .. $#$row) {
684 my $widget = $row->[$c]
685 or next;
686
687 my $col_w = $ws->[$c]; 835 my $col_w = $ws->[$c];
688 836
837 if (my $widget = $row->[$c]) {
689 $widget->size_allocate ($x, $y, $col_w, $row_h); 838 $widget->size_allocate ($x, $y, $col_w, $row_h);
839 }
690 840
691 $x += $col_w; 841 $x += $col_w;
692 } 842 }
693 843
694 $y += $row_h; 844 $y += $row_h;
695 } 845 }
696 846
697} 847}
698 848
849sub find_widget {
850 my ($self, $x, $y) = @_;
851
852 $x -= $self->{x};
853 $y -= $self->{y};
854
855 my $res;
856
857 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
858 $res = $_->find_widget ($x, $y)
859 and return $res;
860 }
861
862 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
863}
864
699sub _draw { 865sub _draw {
700 my ($self) = @_; 866 my ($self) = @_;
701 867
702 for (grep $_, @{$self->{children}}) { 868 for (grep $_, @{$self->{children}}) {
703 $_->draw for grep $_, @$_; 869 $_->draw for grep $_, @$_;
704 } 870 }
705} 871}
706 872
707############################################################################# 873#############################################################################
708 874
875package CFClient::UI::HBox;
876
877# TODO: wrap into common Box base class
878
879our @ISA = CFClient::UI::Container::;
880
881sub size_request {
882 my ($self) = @_;
883
884 my @alloc = map [$_->size_request], @{$self->{children}};
885
886 (
887 (List::Util::sum map $_->[0], @alloc),
888 (List::Util::max map $_->[1], @alloc),
889 )
890}
891
892sub size_allocate {
893 my ($self, $x, $y, $w, $h) = @_;
894
895 $self->_size_allocate ($x, $y, $w, $h) or return;
896
897 ($h, $w) = ($w, $h);
898
899 my $children = $self->{children};
900
901 my @h = map +($_->size_request)[0], @$children;
902
903 my $req_h = List::Util::sum @h;
904
905 if ($req_h > $h) {
906 # ah well, not enough space
907 $_ *= $h / $req_h for @h;
908 } else {
909 my $exp = List::Util::sum map $_->{expand}, @$children;
910 $exp ||= 1;
911
912 for (0 .. $#$children) {
913 my $child = $children->[$_];
914
915 my $alloc_h = $h[$_];
916 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
917 $h[$_] = $alloc_h;
918 }
919 }
920
921 CFClient::UI::harmonize \@h;
922
923 my $y = 0;
924 for (0 .. $#$children) {
925 my $child = $children->[$_];
926 my $h = $h[$_];
927 $child->size_allocate ($y, 0, $h, $w);
928
929 $y += $h;
930 }
931
932 1
933}
934
935#############################################################################
936
709package CFClient::UI::VBox; 937package CFClient::UI::VBox;
710 938
939# TODO: wrap into common Box base class
940
711our @ISA = CFClient::UI::Container::; 941our @ISA = CFClient::UI::Container::;
712
713use SDL::OpenGL;
714 942
715sub size_request { 943sub size_request {
716 my ($self) = @_; 944 my ($self) = @_;
717 945
718 my @alloc = map [$_->size_request], @{$self->{children}}; 946 my @alloc = map [$_->size_request], @{$self->{children}};
726sub size_allocate { 954sub size_allocate {
727 my ($self, $x, $y, $w, $h) = @_; 955 my ($self, $x, $y, $w, $h) = @_;
728 956
729 $self->_size_allocate ($x, $y, $w, $h) or return; 957 $self->_size_allocate ($x, $y, $w, $h) or return;
730 958
731 return unless $self->{h};
732
733 my $children = $self->{children}; 959 my $children = $self->{children};
734 960
735 my @h = map +($_->size_request)[1], @$children; 961 my @h = map +($_->size_request)[1], @$children;
736 962
737 my $req_h = List::Util::sum @h; 963 my $req_h = List::Util::sum @h;
738 964
739 if ($req_h > $h) { 965 if ($req_h > $h) {
740 # ah well, not enough space 966 # ah well, not enough space
741 $_ = $h[$_] * $h / $req_h for @h; 967 $_ *= $h / $req_h for @h;
742 } else { 968 } else {
743 my @exp = grep $_->{expand}, @$children; 969 my $exp = List::Util::sum map $_->{expand}, @$children;
744 @exp = @$children unless @exp; 970 $exp ||= 1;
745 971
746 my %exp = map +($_ => 1), @exp;
747
748 for (0 .. $#$children) { 972 for (0 .. $#$children) {
749 my $child = $children->[$_]; 973 my $child = $children->[$_];
750 974
751 my $alloc_h = $h[$_]; 975 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
752 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
753 $h[$_] = $alloc_h;
754 } 976 }
755 } 977 }
978
979 CFClient::UI::harmonize \@h;
756 980
757 my $y = 0; 981 my $y = 0;
758 for (0 .. $#$children) { 982 for (0 .. $#$children) {
759 my $child = $children->[$_]; 983 my $child = $children->[$_];
760 my $h = $h[$_]; 984 my $h = $h[$_];
761 $child->size_allocate (0, $y, $w, $h); 985 $child->size_allocate (0, $y, $w, $h);
762 986
763 $y += $h; 987 $y += $h;
764 } 988 }
989
990 1
765} 991}
766 992
767############################################################################# 993#############################################################################
768 994
769package CFClient::UI::Label; 995package CFClient::UI::Label;
774 1000
775sub new { 1001sub new {
776 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
777 1003
778 my $self = $class->SUPER::new ( 1004 my $self = $class->SUPER::new (
779 fg => [1, 1, 1], 1005 fg => [1, 1, 1],
780 height => $::FONTSIZE, 1006 fontsize => $::FONTSIZE,
781 text => "", 1007 text => "",
782 align => -1, 1008 align => -1,
1009 valign => -1,
1010 padding => 2,
783 layout => new CFClient::Layout, 1011 layout => new CFClient::Layout,
784 %arg 1012 %arg
785 ); 1013 );
786 1014
787 $self->set_text ($self->{text}); 1015 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1016
1017 $self->set_text (delete $self->{text}) if exists $self->{text};
1018 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
788 1019
789 $self 1020 $self
790} 1021}
791 1022
792sub escape_text { 1023sub escape_text {
800} 1031}
801 1032
802sub set_text { 1033sub set_text {
803 my ($self, $text) = @_; 1034 my ($self, $text) = @_;
804 1035
805 $self->{text} = $text;
806 $self->{layout}->set_markup ($text); 1036 $self->{layout}->set_text ($text);
807 1037
808 delete $self->{texture}; 1038 delete $self->{texture};
809 $self->update; 1039 $self->update;
810} 1040}
811 1041
812sub get_text { 1042sub set_markup {
813 my ($self, $text) = @_; 1043 my ($self, $markup) = @_;
814 1044
815 $self->{text} 1045 $self->{layout}->set_markup ($markup);
1046
1047 delete $self->{texture};
1048 $self->update;
816} 1049}
817 1050
818sub size_request { 1051sub size_request {
819 my ($self) = @_; 1052 my ($self) = @_;
820 1053
821 $self->{layout}->set_width; 1054 $self->{layout}->set_width;
822 $self->{layout}->set_height ($self->{height}); 1055 $self->{layout}->set_height ($self->{fontsize});
1056
823 $self->{layout}->size 1057 my ($w, $h) = $self->{layout}->size;
824# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 1058
825# ( 1059 (
826# $self->{texture}{w}, 1060 $w + $self->{padding} * 2,
827# $self->{texture}{h}, 1061 $h + $self->{padding} * 2,
828# ) 1062 )
829# } else {
830# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831#
832# ($w, $h)
833# }
834} 1063}
835 1064
836sub size_allocate { 1065sub size_allocate {
837 my ($self, $x, $y, $w, $h) = @_; 1066 my ($self, $x, $y, $w, $h) = @_;
838 1067
851sub _draw { 1080sub _draw {
852 my ($self) = @_; 1081 my ($self) = @_;
853 1082
854 my $tex = $self->{texture} ||= do { 1083 my $tex = $self->{texture} ||= do {
855 $self->{layout}->set_width ($self->{w}); 1084 $self->{layout}->set_width ($self->{w});
1085 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
856 new_from_layout CFClient::Texture $self->{layout} 1086 new_from_layout CFClient::Texture $self->{layout}
857 }; 1087 };
858 1088
859 glEnable GL_BLEND; 1089 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1091 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 1093
864 glColor @{$self->{fg}}; 1094 glColor @{$self->{fg}};
865 1095
866 my $x = 1096 $self->{ox} = int (
867 $self->{align} < 0 ? 0 1097 $self->{align} < 0 ? $self->{padding}
868 : $self->{align} > 0 ? $self->{w} - $tex->{w} 1098 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869 : ($self->{w} - $tex->{w}) * 0.5; 1099 : ($self->{w} - $tex->{w}) * 0.5
1100 );
870 1101
871 $tex->draw_quad ($x, 0); 1102 $self->{oy} = int (
1103 $self->{valign} < 0 ? $self->{padding}
1104 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1105 : ($self->{h} - $tex->{h}) * 0.5
1106 );
1107
1108 $tex->draw_quad ($self->{ox}, $self->{oy});
872 1109
873 glDisable GL_TEXTURE_2D; 1110 glDisable GL_TEXTURE_2D;
874 glDisable GL_BLEND; 1111 glDisable GL_BLEND;
875} 1112}
876 1113
877############################################################################# 1114#############################################################################
878 1115
879package CFClient::UI::Entry; 1116package CFClient::UI::EntryBase;
880 1117
881our @ISA = CFClient::UI::Label::; 1118our @ISA = CFClient::UI::Label::;
882 1119
883use SDL; 1120use SDL;
884use SDL::OpenGL; 1121use SDL::OpenGL;
886sub new { 1123sub new {
887 my $class = shift; 1124 my $class = shift;
888 1125
889 $class->SUPER::new ( 1126 $class->SUPER::new (
890 fg => [1, 1, 1], 1127 fg => [1, 1, 1],
891 bg => [0, 0, 0, 0.4], 1128 bg => [0, 0, 0, 0.2],
892 active_bg => [1, 1, 1], 1129 active_bg => [1, 1, 1, 0.5],
893 active_fg => [0, 0, 0], 1130 active_fg => [0, 0, 0],
1131 can_hover => 1,
1132 can_focus => 1,
1133 valign => 0,
894 @_ 1134 @_
895 ) 1135 )
896} 1136}
897 1137
898sub _set_text { 1138sub _set_text {
899 my ($self, $text) = @_; 1139 my ($self, $text) = @_;
900 1140
1141 delete $self->{cur_h};
1142
1143 return if $self->{text} eq $text;
1144
901 $self->{last_activity} = $::NOW; 1145 $self->{last_activity} = $::NOW;
902
903 $self->{text} = $text; 1146 $self->{text} = $text;
904 $self->{layout}->set_width ($self->{w});
905 1147
906 $text =~ s/./*/g if $self->{hidden}; 1148 $text =~ s/./*/g if $self->{hidden};
1149 $self->{layout}->set_text ("$text ");
907 1150
1151 $self->emit (changed => $self->{text});
1152}
908 1153
909 $self->{layout}->set_markup ($self->escape_text ($text)); 1154sub get_text {
910 1155 $_[0]{text}
911 $text = substr $text, 0, $self->{cursor};
912 utf8::encode $text;
913
914 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
915} 1156}
916 1157
917sub size_request { 1158sub size_request {
918 my ($self) = @_; 1159 my ($self) = @_;
919 1160
923} 1164}
924 1165
925sub size_allocate { 1166sub size_allocate {
926 my ($self, $x, $y, $w, $h) = @_; 1167 my ($self, $x, $y, $w, $h) = @_;
927 1168
928 $self->SUPER::size_allocate ($x, $y, $w, $h); 1169 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
929 1170
930 $self->_set_text ($self->{text}); 1171 $self->_set_text ($self->{text});
931} 1172}
932 1173
933sub set_text { 1174sub set_text {
954 substr $text, $self->{cursor}, 1, ""; 1195 substr $text, $self->{cursor}, 1, "";
955 } elsif ($sym == SDLK_LEFT) { 1196 } elsif ($sym == SDLK_LEFT) {
956 --$self->{cursor} if $self->{cursor}; 1197 --$self->{cursor} if $self->{cursor};
957 } elsif ($sym == SDLK_RIGHT) { 1198 } elsif ($sym == SDLK_RIGHT) {
958 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1199 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1200 } elsif ($sym == SDLK_HOME) {
1201 $self->{cursor} = 0;
1202 } elsif ($sym == SDLK_END) {
1203 $self->{cursor} = length $text;
1204 } elsif ($sym == SDLK_ESCAPE) {
1205 $self->emit ('escape');
959 } elsif ($uni) { 1206 } elsif ($uni) {
960 substr $text, $self->{cursor}++, 0, chr $uni; 1207 substr $text, $self->{cursor}++, 0, chr $uni;
961 } 1208 }
962 1209
963 $self->_set_text ($text); 1210 $self->_set_text ($text);
978 $self->SUPER::button_down ($ev, $x, $y); 1225 $self->SUPER::button_down ($ev, $x, $y);
979 1226
980 my $idx = $self->{layout}->xy_to_index ($x, $y); 1227 my $idx = $self->{layout}->xy_to_index ($x, $y);
981 1228
982 # byte-index to char-index 1229 # byte-index to char-index
983 my $text = $self->{layout}; 1230 my $text = $self->{text};
984 utf8::encode $text; 1231 utf8::encode $text;
985 $self->{cursor} = length substr $text, 0, $idx; 1232 $self->{cursor} = length substr $text, 0, $idx;
986 1233
987 $self->_set_text ($self->{text}); 1234 $self->_set_text ($self->{text});
988 $self->update; 1235 $self->update;
1003 $self->{fg} = $self->{active_fg}; 1250 $self->{fg} = $self->{active_fg};
1004 } else { 1251 } else {
1005 glColor @{$self->{bg}}; 1252 glColor @{$self->{bg}};
1006 } 1253 }
1007 1254
1255 glEnable GL_BLEND;
1256 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008 glBegin GL_QUADS; 1257 glBegin GL_QUADS;
1009 glVertex 0 , 0; 1258 glVertex 0 , 0;
1010 glVertex 0 , $self->{h}; 1259 glVertex 0 , $self->{h};
1011 glVertex $self->{w}, $self->{h}; 1260 glVertex $self->{w}, $self->{h};
1012 glVertex $self->{w}, 0; 1261 glVertex $self->{w}, 0;
1013 glEnd; 1262 glEnd;
1263 glDisable GL_BLEND;
1014 1264
1015 $self->SUPER::_draw; 1265 $self->SUPER::_draw;
1016 1266
1017 #TODO: force update every cursor change :( 1267 #TODO: force update every cursor change :(
1018 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1268 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1269
1270 unless (exists $self->{cur_h}) {
1271 my $text = substr $self->{text}, 0, $self->{cursor};
1272 utf8::encode $text;
1273
1274 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1275 }
1276
1019 glColor @{$self->{fg}}; 1277 glColor @{$self->{fg}};
1020 glBegin GL_LINES; 1278 glBegin GL_LINES;
1021 glVertex $self->{cur_x}, $self->{cur_y};
1022 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1279 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1280 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1023 glEnd; 1281 glEnd;
1024 } 1282 }
1025} 1283}
1026 1284
1027#############################################################################
1028
1029package CFClient::UI::Slider; 1285package CFClient::UI::Entry;
1030 1286
1031use strict; 1287our @ISA = CFClient::UI::EntryBase::;
1032 1288
1289use SDL;
1033use SDL::OpenGL; 1290use SDL::OpenGL;
1034 1291
1035our @ISA = CFClient::UI::DrawBG::; 1292sub key_down {
1036
1037sub size_request {
1038 my ($self) = @_; 1293 my ($self, $ev) = @_;
1039 1294
1040 my $w = 50; 1295 my $sym = $ev->key_sym;
1041 my $h = 10;
1042 1296
1043 $self->{vertical} ? ($h, $w) : ($w, $h) 1297 if ($sym == SDLK_RETURN) {
1298 $self->emit (activate => $self->get_text);
1299 $self->update;
1300
1301 } else {
1302 $self->SUPER::key_down ($ev);
1303 }
1304
1044} 1305}
1306
1307#############################################################################
1308
1309package CFClient::UI::Button;
1310
1311our @ISA = CFClient::UI::Label::;
1312
1313use SDL;
1314use SDL::OpenGL;
1315
1316my @tex =
1317 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1318 qw(b1_button_active.png);
1045 1319
1046sub new { 1320sub new {
1047 my $class = shift; 1321 my $class = shift;
1048 1322
1323 $class->SUPER::new (
1324 padding => 4,
1325 fg => [1, 1, 1],
1326 bg => [1, 1, 1, 0.2],
1327 active_fg => [0, 0, 1],
1328 can_hover => 1,
1329 @_
1330 )
1331}
1332
1333sub button_up {
1334 my ($self, $ev, $x, $y) = @_;
1335
1336 if ($x >= 0 && $x < $self->{w}
1337 && $y >= 0 && $y < $self->{h}) {
1338 $self->emit ("activate");
1339 }
1340}
1341
1342sub _draw {
1343 my ($self) = @_;
1344
1345 local $self->{fg} = $self->{fg};
1346
1347 if ($GRAB == $self) {
1348 $self->{fg} = $self->{active_fg};
1349 }
1350
1351 glEnable GL_BLEND;
1352 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1353 glEnable GL_TEXTURE_2D;
1354 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1355 glColor 0, 0, 0, 1;
1356
1357 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1358
1359 glDisable GL_TEXTURE_2D;
1360 glDisable GL_BLEND;
1361
1362 $self->SUPER::_draw;
1363}
1364
1365#############################################################################
1366
1367package CFClient::UI::CheckBox;
1368
1369our @ISA = CFClient::UI::DrawBG::;
1370
1371my @tex =
1372 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1373 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1374
1375use SDL;
1376use SDL::OpenGL;
1377
1378sub new {
1379 my $class = shift;
1380
1381 $class->SUPER::new (
1382 padding => 2,
1383 fg => [1, 1, 1],
1384 active_fg => [1, 1, 0],
1385 state => 0,
1386 can_hover => 1,
1387 @_
1388 )
1389}
1390
1391sub size_request {
1392 my ($self) = @_;
1393
1394 ($self->{padding} * 2 + 6) x 2
1395}
1396
1397sub size_allocate {
1398 my ($self, $x, $y, $w, $h) = @_;
1399
1400 $self->_size_allocate ($x, $y, $w, $h) or return;
1401}
1402
1403sub button_down {
1404 my ($self, $ev, $x, $y) = @_;
1405
1406 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1407 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1408 $self->{state} = !$self->{state};
1409 $self->emit (changed => $self->{state});
1410 }
1411}
1412
1413sub _draw {
1414 my ($self) = @_;
1415
1416 $self->SUPER::_draw;
1417
1418 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1419
1420 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1421
1422 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1423
1424 glEnable GL_BLEND;
1425 glEnable GL_TEXTURE_2D;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1427
1428 my $tex = $self->{state} ? $tex[1] : $tex[0];
1429
1430 $tex->draw_quad (0, 0, $s, $s);
1431
1432 glDisable GL_TEXTURE_2D;
1433 glDisable GL_BLEND;
1434}
1435
1436#############################################################################
1437
1438package CFClient::UI::VGauge;
1439
1440our @ISA = CFClient::UI::Base::;
1441
1442use SDL::OpenGL;
1443
1444my %tex = (
1445 food => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1448 ],
1449 grace => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1452 ],
1453 hp => [
1454 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1455 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1456 ],
1457 mana => [
1458 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1459 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1460 ],
1461);
1462
1463# eg. VGauge->new (gauge => 'food'), default gauge: food
1464sub new {
1465 my $class = shift;
1466
1467 my $self = $class->SUPER::new (gauge => 'food', @_);
1468
1469 $self
1470}
1471
1472sub size_request {
1473 my ($self) = @_;
1474
1475 ($self->{w}, $self->{h})
1476}
1477
1478sub set_max {
1479 my ($self, $max) = @_;
1480 $self->{max_val} = $max;
1481}
1482
1483sub set_value {
1484 my ($self, $val, $max) = @_;
1485
1486 $self->set_max ($max)
1487 if defined $max;
1488
1489 $max = $self->{max_val};
1490 $self->{val} = $val;
1491
1492 $self->update;
1493}
1494
1495sub _draw {
1496 my ($self) = @_;
1497
1498 my $tex = $tex{$self->{gauge}};
1499
1500 my ($w, $h) = ($self->{w}, $self->{h});
1501
1502 my $ycut = $self->{val} / ($self->{max_val} || 1);
1503 $ycut = 1 if $self->{val} > $self->{max_val};
1504
1505 my $t1 = $tex->[0];
1506 my $t2 = $tex->[1];
1507
1508 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512
1513 my $h1 = $self->{h} - $ycut * $self->{h};
1514 my $h2 = $ycut * $self->{h};
1515
1516 my $yp = 0;
1517
1518 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1519 glBegin (GL_QUADS);
1520 glTexCoord (0, 0); glVertex (0 , $yp);
1521 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1522 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1523 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1524 glEnd ();
1525
1526 $yp += $h1;
1527
1528 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1529 glBegin (GL_QUADS);
1530 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1531 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1532 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1533 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1534 glEnd ();
1535
1536 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D;
1538}
1539
1540#############################################################################
1541
1542package CFClient::UI::Slider;
1543
1544use strict;
1545
1546use SDL::OpenGL;
1547
1548our @ISA = CFClient::UI::DrawBG::;
1549
1550my @tex =
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1552 qw(s1_slider.png s1_slider_bg.png);
1553
1554sub new {
1555 my $class = shift;
1556
1049 # range [value, low, high, page] 1557 # range [value, low, high, page]
1050 1558
1559 # TODO: 0-width page
1560 # TODO: req_w/h are wrong with vertical
1561 # TODO: calculations are off
1051 $class->SUPER::new ( 1562 my $self = $class->SUPER::new (
1052 fg => [1, 1, 1], 1563 fg => [1, 1, 1],
1053 active_fg => [0, 0, 0], 1564 active_fg => [0, 0, 0],
1054 range => [0, 0, 100, 10], 1565 range => [0, 0, 100, 10],
1566 req_w => 40,
1567 req_h => 13,
1055 vertical => 1, 1568 vertical => 0,
1569 can_hover => 1,
1570 inner_pad => 5,
1056 @_ 1571 @_
1057 ) 1572 );
1573
1574 $self
1575}
1576
1577sub size_request {
1578 my ($self) = @_;
1579
1580 my $w = $self->{req_w};
1581 my $h = $self->{req_h};
1582
1583 $self->{vertical} ? ($h, $w) : ($w, $h)
1058} 1584}
1059 1585
1060sub button_down { 1586sub button_down {
1061 my ($self, $ev, $x, $y) = @_; 1587 my ($self, $ev, $x, $y) = @_;
1062 1588
1070 if ($GRAB == $self) { 1596 if ($GRAB == $self) {
1071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1597 my ($value, $lo, $hi, $page) = @{$self->{range}};
1072 1598
1073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1599 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074 1600
1601 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1602 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1603
1604 $x -= $inner_pad_px; # substract the padding
1075 $x = $x * ($hi - $lo) / $w + $lo; 1605 $x = $x * ($hi - $lo) / $inner_w + $lo;
1076 $x = $lo if $x < $lo; 1606 $x = $lo if $x < $lo;
1077 $x = $hi - $page if $x > $hi - $page; 1607 $x = $hi - $page if $x > $hi - $page;
1078 $self->{range}[0] = $x; 1608 $self->{range}[0] = $x;
1079 1609
1080 $self->emit (changed => $x); 1610 $self->emit (changed => $x);
1081 $self->update; 1611 $self->update;
1082 } 1612 }
1613}
1614
1615# the inner_* stuff is for generating a padding for the slider handle,
1616# so that the handle doesn't leave the texture. This calculation isn't 100%
1617# correct propably, but it does the job for now
1618sub _calc_inner_pad_px {
1619 my ($self, $w) = @_;
1620 ($w / 100) * $self->{inner_pad} # % to pixels
1083} 1621}
1084 1622
1085sub _draw { 1623sub _draw {
1086 my ($self) = @_; 1624 my ($self) = @_;
1087 1625
1101 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1639 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1640 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103 1641
1104 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1642 my ($value, $lo, $hi, $page) = @{$self->{range}};
1105 1643
1644 $hi = $value + 1 if $lo == $hi;
1645
1646 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1647 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1648
1106 $page = int $page * $w / ($hi - $lo); 1649 $page = int $page * $inner_w / ($hi - $lo);
1107 $value = int +($value - $lo) * $w / ($hi - $lo); 1650 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108 1651
1109 $w -= $page; 1652 $w -= $page;
1110 $page &= ~1; 1653 $page &= ~1;
1111 glTranslate $page * 0.5, 0, 0; 1654 glTranslate $page * 0.5, 0, 0;
1655 $page ||= 2;
1112 1656
1113 glColor @$fg;
1114 glBegin GL_LINES;
1115 glVertex 0, 0; glVertex 0, $h;
1116 glVertex $w - 1, 0; glVertex $w - 1, $h;
1117 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1118 glEnd;
1119
1120 my $knob_a = $value - $page * 0.5; 1657 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121 my $knob_b = $value + $page * 0.5; 1658 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122 1659
1123 glBegin GL_QUADS; 1660 glEnable GL_BLEND;
1124 glColor @$fg; 1661 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125 glVertex $knob_a, 0; 1662 glEnable GL_TEXTURE_2D;
1126 glVertex $knob_a, $h; 1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127 glVertex $knob_b, $h;
1128 glVertex $knob_b, 0;
1129 1664
1130 if ($knob_a < $knob_b - 2) { 1665 # draw background
1131 glColor @$bg; 1666 $tex[1]->draw_quad (0, 0, $w, $h);
1132 glVertex $knob_a + 1, 1; 1667
1133 glVertex $knob_a + 1, $h - 1; 1668 # draw handle
1134 glVertex $knob_b - 1, $h - 1; 1669 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135 glVertex $knob_b - 1, 1; 1670
1671 glDisable GL_BLEND;
1672 glDisable GL_TEXTURE_2D;
1673}
1674
1675#############################################################################
1676
1677package CFClient::UI::TextView;
1678
1679our @ISA = CFClient::UI::HBox::;
1680
1681use SDL::OpenGL;
1682
1683sub new {
1684 my $class = shift;
1685
1686 my $self = $class->SUPER::new (
1687 req_w => $::WIDTH / 6,
1688 req_h => $::HEIGHT / 6,
1689 fontsize => $::FONTSIZE,
1690 @_,
1691
1692 layout => (new CFClient::Layout),
1693 par => [],
1694 height => 0,
1695 children => [
1696 (new CFClient::UI::Empty expand => 1),
1697 (new CFClient::UI::Slider vertical => 1),
1698 ],
1699 );
1700
1701 $self->{children}[1]->connect (changed => sub {
1702 $self->update;
1703 });
1704
1705 $self
1706}
1707
1708sub set_fontsize {
1709 my ($self, $fontsize) = @_;
1710
1711 $self->{fontsize} = $fontsize;
1712 $self->reflow;
1713}
1714
1715sub text_height {
1716 my ($self, $text) = @_;
1717
1718 my $layout = $self->{layout};
1719
1720 $layout->set_height ($self->{fontsize});
1721 $layout->set_width ($self->{w});
1722 $layout->set_text ($text);
1136 } 1723
1137 glEnd; 1724 ($layout->size)[1]
1725}
1726
1727sub reflow {
1728 my ($self) = @_;
1729
1730 $self->{need_reflow}++;
1731 $self->update;
1732}
1733
1734sub size_request {
1735 my ($self) = @_;
1736
1737 ($self->{req_w}, $self->{req_h})
1738}
1739
1740sub size_allocate {
1741 my ($self, $x, $y, $w, $h) = @_;
1742
1743 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1744
1745 $self->{layout}->set_height ($self->{fontsize});
1746 $self->{layout}->set_width ($self->{w});
1747
1748 $self->reflow;
1749 $self->update;
1750}
1751
1752sub add_paragraph {
1753 my ($self, $color, $text) = @_;
1754
1755 #TODO: intelligently "reformat" paragraph
1756
1757 my $height = $self->text_height ($text);
1758
1759 $self->{height} += $height;
1760
1761 push @{$self->{par}}, [$height, $color, $text];
1762
1763 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1764 $self->{children}[1]->update;
1765}
1766
1767sub update {
1768 my ($self) = @_;
1769
1770 $self->SUPER::update;
1771
1772 return unless $self->{h} > 0;
1773
1774 delete $self->{texture};
1775
1776 $ROOT->on_refresh ($self, sub {
1777 if (delete $self->{need_reflow}) {
1778 my $height = 0;
1779
1780 $height += $_->[0] = $self->text_height ($_->[2])
1781 for @{$self->{par}};
1782
1783 $self->{height} = $height;
1784
1785 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1786
1787 delete $self->{texture};
1788 }
1789
1790 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1791 glClearColor 0, 0, 0, 1;
1792 glClear GL_COLOR_BUFFER_BIT;
1793
1794 glEnable GL_BLEND;
1795 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1796 glEnable GL_TEXTURE_2D;
1797 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1798
1799 my $top = int $self->{children}[1]{range}[0];
1800
1801 my $y0 = $top;
1802 my $y1 = $top + $self->{h};
1803
1804 my $y = 0;
1805
1806 my $layout = $self->{layout};
1807
1808 for my $par (@{$self->{par}}) {
1809 my $h = $par->[0];
1810
1811 if ($y0 < $y + $h && $y < $y1) {
1812 $layout->set_text ($par->[2]);
1813
1814 glColor @{ $par->[1] };
1815 my ($W, $H) = $layout->size;
1816 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1817 }
1818
1819 $y += $h;
1820 }
1821
1822 glDisable GL_TEXTURE_2D;
1823 glDisable GL_BLEND;
1824 };
1825 });
1826}
1827
1828sub _draw {
1829 my ($self) = @_;
1830
1831 if ($self->{texture}) {
1832 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1835 glDisable GL_TEXTURE_2D;
1836 }
1837
1838 $self->{children}[1]->draw;
1839
1138} 1840}
1139 1841
1140############################################################################# 1842#############################################################################
1141 1843
1142package CFClient::UI::MapWidget; 1844package CFClient::UI::MapWidget;
1152 1854
1153sub new { 1855sub new {
1154 my $class = shift; 1856 my $class = shift;
1155 1857
1156 $class->SUPER::new ( 1858 $class->SUPER::new (
1157 z => -1, 1859 z => -1,
1860 can_focus => 1,
1158 list => (glGenLists 1), 1861 list => (glGenLists 1),
1159 @_ 1862 @_
1160 ) 1863 )
1161} 1864}
1162 1865
1163sub key_down { 1866sub key_down {
1165} 1868}
1166 1869
1167sub key_up { 1870sub key_up {
1168} 1871}
1169 1872
1873sub button_down {
1874 my ($self, $ev, $x, $y) = @_;
1875
1876 $self->focus_in;
1877
1878 if ($ev->button == 2) {
1879 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1880 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1881
1882 $self->{motion} = sub {
1883 my ($ev, $x, $y) = @_;
1884
1885 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1886
1887 $::CFG->{map_shift_x} = $bw + $x - $ox;
1888 $::CFG->{map_shift_y} = $bh + $y - $oy;
1889
1890 $self->update;
1891 };
1892 }
1893}
1894
1895sub button_up {
1896 my ($self, $ev, $x, $y) = @_;
1897
1898 delete $self->{motion};
1899}
1900
1901sub mouse_motion {
1902 my ($self, $ev, $x, $y) = @_;
1903
1904 $self->{motion}->($ev, $x, $y) if $self->{motion};
1905}
1906
1170sub size_request { 1907sub size_request {
1171 ( 1908 (
1172 1 + int $::WIDTH / 32, 1909 1 + 32 * int $::WIDTH / 32,
1173 1 + int $::HEIGHT / 32, 1910 1 + 32 * int $::HEIGHT / 32,
1174 ) 1911 )
1175} 1912}
1176 1913
1177sub update { 1914sub update {
1178 my ($self) = @_; 1915 my ($self) = @_;
1179 1916
1180 $self->{need_update} = 1; 1917 $self->{need_update} = 1;
1181 $self->SUPER::update; 1918 $self->SUPER::update;
1182} 1919}
1183 1920
1184sub _draw { 1921sub draw {
1185 my ($self) = @_; 1922 my ($self) = @_;
1186 1923
1187 if (delete $self->{need_update}) { 1924 if (delete $self->{need_update}) {
1188 glNewList $self->{list}, GL_COMPILE; 1925 glNewList $self->{list}, GL_COMPILE;
1189 1926
1190 my $mx = $::CONN->{mapx}; 1927 if ($::MAP) {
1191 my $my = $::CONN->{mapy};
1192
1193 my $map = $::CONN->{map};
1194
1195 my ($xofs, $yofs);
1196
1197 my $sw = 1 + int $::WIDTH / 32; 1928 my $sw = int $::WIDTH / 32;
1198 my $sh = 1 + int $::HEIGHT / 32; 1929 my $sh = int $::HEIGHT / 32;
1199 1930
1200 if ($::CONN->{mapw} > $sw) { 1931 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1201 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1932 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1202 } else { 1933
1203 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1934 glTranslate $sx0 - 32, $sy0 - 32, 0;
1935
1936 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1937
1938 if ($::CFG->{fow_enable}) {
1939 if ($::CFG->{fow_smooth}) { # smooth fog of war
1940 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1941 glConvolutionFilter2D
1942 GL_CONVOLUTION_2D,
1943 GL_ALPHA,
1944 3, 3,
1945 GL_ALPHA, GL_FLOAT,
1946 pack "f*",
1947 0.1, 0.1, 0.1,
1948 0.1, 0.2, 0.1,
1949 0.1, 0.1, 0.1,
1950 ;
1951 glEnable GL_CONVOLUTION_2D;
1952 }
1953
1954 $self->{fow_texture} = new CFClient::Texture
1955 w => $w,
1956 h => $h,
1957 data => $data,
1958 internalformat => GL_ALPHA,
1959 format => GL_ALPHA;
1960
1961 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1962
1963 glEnable GL_BLEND;
1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1965 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1967
1968 glColor +($::CFG->{fow_intensity}) x 3, 1;
1969 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1970
1971 glDisable GL_TEXTURE_2D;
1972 glDisable GL_BLEND;
1973 }
1974
1975 # HACK BEGIN
1976 {
1977 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1978 my ($w, $h) = (250, 250);
1979
1980 glEnable GL_BLEND;
1981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1982 glEnable GL_TEXTURE_2D;
1983 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1984
1985 $self->{mapmap_texture} =
1986 new CFClient::Texture
1987 w => $w,
1988 h => $h,
1989 data => $::MAP->mapmap ($w, $h),
1990 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1991
1992 $self->{mapmap_texture}->draw_quad (100, 100);
1993
1994 glDisable GL_TEXTURE_2D;
1995 glDisable GL_BLEND;
1996 }
1997 # HACK END
1204 } 1998 }
1205 1999
1206 if ($::CONN->{maph} > $sh) {
1207 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1208 } else {
1209 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1210 }
1211
1212 glEnable GL_TEXTURE_2D;
1213 glEnable GL_BLEND;
1214 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1216
1217 my $sw4 = ($sw + 3) & ~3;
1218 my $darkness = "\x00" x ($sw4 * $sh);
1219
1220 for my $x (0 .. $sw - 1) {
1221 my $row = $map->[$x + $xofs];
1222 for my $y (0 .. $sh - 1) {
1223
1224 my $cell = $row->[$y + $yofs]
1225 or next;
1226
1227 my $dark = $cell->[0];
1228 if ($dark < 0) {
1229 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1230 } else {
1231 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1232 }
1233
1234 for my $num (grep $_, @$cell[1,2,3]) {
1235 my $tex = $::CONN->{face}[$num]{texture} || next;
1236
1237 my ($w, $h) = @$tex{qw(w h)};
1238
1239 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1240 }
1241 }
1242 }
1243
1244# if (1) { # higher quality darkness
1245# $lighting =~ s/(.)/$1$1$1/gs;
1246# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1247#
1248# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1249#
1250# $lighting = $pb->get_pixels;
1251# $lighting =~ s/(.)../$1/gs;
1252# }
1253
1254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1255
1256 $darkness = new CFClient::Texture
1257 w => $sw4,
1258 h => $sh,
1259 data => $darkness,
1260 internalformat => GL_ALPHA,
1261 format => GL_ALPHA;
1262
1263 glColor 0.45, 0.45, 0.45, 1;
1264 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1265
1266 glDisable GL_TEXTURE_2D;
1267 glDisable GL_BLEND;
1268
1269 glEndList; 2000 glEndList;
1270 } 2001 }
1271 2002
2003 glPushMatrix;
1272 glCallList $self->{list}; 2004 glCallList $self->{list};
2005 glPopMatrix;
2006
2007 if ($FOCUS != $self) {
2008 glColor 64/255, 64/255, 64/255;
2009 glLogicOp GL_AND;
2010 glEnable GL_COLOR_LOGIC_OP;
2011 glBegin GL_QUADS;
2012 glVertex 0, 0;
2013 glVertex 0, $::HEIGHT;
2014 glVertex $::WIDTH, $::HEIGHT;
2015 glVertex $::WIDTH, 0;
2016 glEnd;
2017 glDisable GL_COLOR_LOGIC_OP;
2018 }
1273} 2019}
1274 2020
1275my %DIR = ( 2021my %DIR = (
1276 SDLK_KP8, [1, "north"], 2022 SDLK_KP8, [1, "north"],
1277 SDLK_KP9, [2, "northeast"], 2023 SDLK_KP9, [2, "northeast"],
1293 2039
1294 my $mod = $ev->key_mod; 2040 my $mod = $ev->key_mod;
1295 my $sym = $ev->key_sym; 2041 my $sym = $ev->key_sym;
1296 2042
1297 if ($sym == SDLK_KP5) { 2043 if ($sym == SDLK_KP5) {
1298 $::CONN->send ("command stay fire"); 2044 $::CONN->user_send ("stay fire");
2045 } elsif ($sym == SDLK_a) {
2046 $::CONN->user_send ("apply");
2047 } elsif ($sym == SDLK_QUOTE) {
2048 $self->emit ('activate_console');
2049 } elsif ($sym == SDLK_SLASH) {
2050 $self->emit ('activate_console' => '/');
1299 } elsif (exists $DIR{$sym}) { 2051 } elsif (exists $DIR{$sym}) {
1300 if ($mod & KMOD_SHIFT) { 2052 if ($mod & KMOD_SHIFT) {
1301 $self->{shft}++; 2053 $self->{shft}++;
1302 $::CONN->send ("command fire $DIR{$sym}[0]"); 2054 $::CONN->user_send ("fire $DIR{$sym}[0]");
1303 } elsif ($mod & KMOD_CTRL) { 2055 } elsif ($mod & KMOD_CTRL) {
1304 $self->{ctrl}++; 2056 $self->{ctrl}++;
1305 $::CONN->send ("command run $DIR{$sym}[0]"); 2057 $::CONN->user_send ("run $DIR{$sym}[0]");
1306 } else { 2058 } else {
1307 $::CONN->send ("command $DIR{$sym}[1]"); 2059 $::CONN->user_send ("$DIR{$sym}[1]");
1308 } 2060 }
1309 } 2061 }
1310} 2062}
1311 2063
1312sub key_up { 2064sub key_up {
1314 2066
1315 my $mod = $ev->key_mod; 2067 my $mod = $ev->key_mod;
1316 my $sym = $ev->key_sym; 2068 my $sym = $ev->key_sym;
1317 2069
1318 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2070 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319 $::CONN->send ("command fire_stop"); 2071 $::CONN->user_send ("fire_stop");
1320 } 2072 }
1321 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2073 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322 $::CONN->send ("command run_stop"); 2074 $::CONN->user_send ("run_stop");
1323 } 2075 }
1324} 2076}
1325 2077
1326############################################################################# 2078#############################################################################
1327 2079
1365 glPopMatrix; 2117 glPopMatrix;
1366} 2118}
1367 2119
1368############################################################################# 2120#############################################################################
1369 2121
1370package CFClient::UI::Toplevel; 2122package CFClient::UI::Flopper;
2123
2124our @ISA = CFClient::UI::Button::;
2125
2126sub new {
2127 my $class = shift;
2128
2129 my $self = $class->SUPER::new (
2130 state => 0,
2131 connect_activate => \&toggle_flopper,
2132 @_
2133 );
2134
2135 if ($self->{state}) {
2136 $self->{state} = 0;
2137 $self->toggle_flopper;
2138 }
2139
2140 $self
2141}
2142
2143sub toggle_flopper {
2144 my ($self) = @_;
2145
2146 # TODO: use animation
2147 if ($self->{state} = !$self->{state}) {
2148 $CFClient::UI::ROOT->add ($self->{other});
2149 $self->{other}->move ($self->coord2global (0, $self->{h}));
2150 $self->emit ("open");
2151 } else {
2152 $CFClient::UI::ROOT->remove ($self->{other});
2153 $self->emit ("close");
2154 }
2155
2156 $self->emit (changed => $self->{state});
2157}
2158
2159#############################################################################
2160
2161package CFClient::UI::Root;
1371 2162
1372our @ISA = CFClient::UI::Container::; 2163our @ISA = CFClient::UI::Container::;
2164
2165use SDL::OpenGL;
2166
2167sub check_size {
2168 my ($self) = @_;
2169
2170 $self->size_allocate (0, 0, $::WITH, $::HEIGHT);
2171}
1373 2172
1374sub size_request { 2173sub size_request {
1375 ($::WIDTH, $::HEIGHT) 2174 ($::WIDTH, $::HEIGHT)
1376} 2175}
1377 2176
1382 2181
1383 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2182 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1384 for @{$self->{children}}; 2183 for @{$self->{children}};
1385} 2184}
1386 2185
1387sub translate { 2186sub _topleft {
1388 my ($self, $x, $y) = @_; 2187 my ($self, $x, $y) = @_;
1389 2188
1390 ($x, $y) 2189 ($x, $y)
1391} 2190}
1392 2191
1393sub update { 2192sub update {
1394 my ($self) = @_; 2193 my ($self) = @_;
1395 2194
1396 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2195 $self->check_size;
1397 ::refresh (); 2196 ::refresh ();
1398} 2197}
1399 2198
1400sub add { 2199sub add {
1401 my ($self, $widget) = @_; 2200 my ($self, $widget) = @_;
1402 2201
1403 $self->SUPER::add ($widget); 2202 $self->SUPER::add ($widget);
1404 2203
1405 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2204 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2205}
2206
2207sub on_refresh {
2208 my ($self, $id, $cb) = @_;
2209
2210 $self->{refresh_hook}{$id} = $cb;
1406} 2211}
1407 2212
1408sub draw { 2213sub draw {
1409 my ($self) = @_; 2214 my ($self) = @_;
1410 2215
2216 while (my $rcb = delete $self->{refresh_hook}) {
2217 $_->() for values %$rcb;
2218 }
2219
2220 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2221 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2222 glClear GL_COLOR_BUFFER_BIT;
2223
2224 glMatrixMode GL_PROJECTION;
2225 glLoadIdentity;
2226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2227 glMatrixMode GL_MODELVIEW;
2228 glLoadIdentity;
2229
1411 $self->_draw; 2230 $self->_draw;
1412} 2231}
1413 2232
1414############################################################################# 2233#############################################################################
1415 2234
1416package CFClient::UI; 2235package CFClient::UI;
1417 2236
1418$TOPLEVEL = new CFClient::UI::Toplevel; 2237$ROOT = new CFClient::UI::Root;
1419 2238
14201 22391
1421 2240

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines