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.127 by root, Mon Apr 17 21:03:31 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
388 $child->check_size;
342} 389}
343 390
344sub remove { 391sub remove {
345 my ($self, $widget) = @_; 392 my ($self, $widget) = @_;
346 393
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 394 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348 395
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 396 $self->check_size;
350} 397}
351 398
352sub find_widget { 399sub find_widget {
353 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
354 401
439} 486}
440 487
441sub render_chld { 488sub render_chld {
442 my ($self) = @_; 489 my ($self) = @_;
443 490
444 $self->{texture} = 491 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 492 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 493 glClear GL_COLOR_BUFFER_BIT;
447 ); 494 $self->child->draw;
495 };
448} 496}
449 497
450sub size_allocate { 498sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
452 500
473 $tex->draw_quad (0, 0, $w, $h); 521 $tex->draw_quad (0, 0, $w, $h);
474 522
475 glDisable GL_BLEND; 523 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D; 524 glDisable GL_TEXTURE_2D;
477} 525}
526
527#############################################################################
528
529package CFClient::UI::ViewPort;
530
531our @ISA = CFClient::UI::Window::;
532
533sub new { die }
534
535sub size_request {
536 my ($self) = @_;
537
538 @$self{qw(child_w child_h)} = $self->child->size_request;
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540
541 @$self{qw(child_w child_h)}
542}
543
544sub size_allocate {
545 my ($self, $x, $y, $w, $h) = @_;
546
547 $self->_size_allocate ($x, $y, $w, $h) or return;
548}
549
550sub _draw {
551 my ($self) = @_;
552
553 $self->{children}[1]->draw;
554}
555
478 556
479############################################################################# 557#############################################################################
480 558
481package CFClient::UI::Frame; 559package CFClient::UI::Frame;
482 560
530 608
531my @tex = 609my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 610 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); 611 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534 612
613sub new {
614 my $class = shift;
615
616 # TODO: user_x, user_y, overwrite moveto?
617
618 $class->SUPER::new (
619 bg => [1, 1, 1, 1],
620 border_bg => [1, 1, 1, 1],
621 border => int $::FONTSIZE * 0.8,
622 @_
623 )
624}
625
535sub size_request { 626sub size_request {
536 my ($self) = @_; 627 my ($self) = @_;
537 628
629 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
630
538 my ($w, $h) = $self->SUPER::size_request; 631 my ($w, $h) = $self->SUPER::size_request;
539 632
540 $h += $tex[1]->{h}; 633 (
541 $h += $tex[4]->{h}; 634 $w + $self->{border} * 2,
542 $w += $tex[2]->{w}; 635 $h + $self->{border} * 2,
543 $w += $tex[3]->{w}; 636 )
544
545 ($w, $h)
546} 637}
547 638
548sub size_allocate { 639sub size_allocate {
549 my ($self, $x, $y, $w, $h) = @_; 640 my ($self, $x, $y, $w, $h) = @_;
550 641
551 $self->_size_allocate ($x, $y, $w, $h) or return; 642 $self->_size_allocate ($x, $y, $w, $h) or return;
552 643
553 $h -= $tex[1]->{h}; 644 $h -= List::Util::max 0, $self->{border} * 2;
554 $h -= $tex[4]->{h}; 645 $w -= List::Util::max 0, $self->{border} * 2;
555 $w -= $tex[2]->{w};
556 $w -= $tex[3]->{w};
557 646
558 $h = $h < 0 ? 0 : $h; 647 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
559 $w = $w < 0 ? 0 : $w; 648}
560 649
561 my $child = $self->child; 650sub button_down {
651 my ($self, $ev, $x, $y) = @_;
562 652
563 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 653 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
654 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
655
656 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
657 my ($bw, $bh) = ($self->{w}, $self->{h});
658
659 $self->{motion} = sub {
660 my ($ev, $x, $y) = @_;
661
662 ($x, $y) = ($ev->motion_x, $ev->motion_y);
663
664 $self->{user_w} = $bw + $x - $ox;
665 $self->{user_h} = $bh + $y - $oy;
666 $self->update;
667 };
668
669 } elsif ($x >= 0 && $x < $self->{w}
670 && $y >= 0 && $y < $self->{border}) {
671
672 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
673 my ($bx, $by) = ($self->{x}, $self->{y});
674
675 $self->{motion} = sub {
676 my ($ev, $x, $y) = @_;
677
678 ($x, $y) = ($ev->motion_x, $ev->motion_y);
679
680 $self->move ($bx + $x - $ox, $by + $y - $oy);
681 $self->update;
682 };
683 }
684}
685
686sub button_up {
687 my ($self, $ev, $x, $y) = @_;
688
689 delete $self->{motion};
690}
691
692sub mouse_motion {
693 my ($self, $ev, $x, $y) = @_;
694
695 $self->{motion}->($ev, $x, $y) if $self->{motion};
564} 696}
565 697
566sub _draw { 698sub _draw {
567 my ($self) = @_; 699 my ($self) = @_;
568 700
569 my ($w, $h) = ($self->{w}, $self->{h}); 701 my ($w, $h ) = ($self->{w}, $self->{h});
570 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 702 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
571 703
572 glEnable GL_BLEND; 704 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
574 glEnable GL_TEXTURE_2D; 706 glEnable GL_TEXTURE_2D;
575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
576 708
577 my $top = $tex[1]; 709 glColor @{ $self->{border_bg} };
578 $top->draw_quad (0, 0, $w, $top->{h}); 710 $tex[1]->draw_quad (0, 0, $w, $self->{border});
579 711 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
580 my $left = $tex[3]; 712 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
581 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 713 $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 714
589 my $bg = $tex[0]; 715 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 716
717 # TODO: repeat texture not scale
595 my $rep_x = $cw / $bg->{w}; 718 my $rep_x = $cw / $bg->{w};
596 my $rep_y = $ch / $bg->{h}; 719 my $rep_y = $ch / $bg->{h};
597 720
721 glColor @{ $self->{bg} };
722
723 $bg->{s} = $rep_x;
724 $bg->{t} = $rep_y;
725 $bg->{wrap_mode} = 1;
598 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 726 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
599 727
728 glDisable GL_TEXTURE_2D;
600 glDisable GL_BLEND; 729 glDisable GL_BLEND;
601 glDisable GL_TEXTURE_2D;
602 730
603 $self->child->draw; 731 $self->child->draw;
604
605} 732}
606 733
607############################################################################# 734#############################################################################
608 735
609package CFClient::UI::Table; 736package CFClient::UI::Table;
612 739
613use List::Util qw(max sum); 740use List::Util qw(max sum);
614 741
615use SDL::OpenGL; 742use SDL::OpenGL;
616 743
744sub new {
745 my $class = shift;
746
747 $class->SUPER::new (
748 col_expand => [],
749 @_
750 )
751}
752
617sub add { 753sub add {
618 my ($self, $x, $y, $chld) = @_; 754 my ($self, $x, $y, $child) = @_;
619 755
756 $child->set_parent ($self);
620 $self->{children}[$y][$x] = $chld; 757 $self->{children}[$y][$x] = $child;
621 $chld->set_parent ($self);
622 758
623 $self->{w} = $self->{h} = -1; 759 $self->{w} = $self->{h} = -1;
760
761 $child->check_size;
762}
763
764# TODO: move to container class maybe? send childs a signal on removal?
765sub clear {
766 my ($self) = @_;
767
768 delete $self->{children};
624 $self->update; 769 $self->update;
625} 770}
626 771
627sub get_wh { 772sub get_wh {
628 my ($self) = @_; 773 my ($self) = @_;
650 my ($self) = @_; 795 my ($self) = @_;
651 796
652 my ($ws, $hs) = $self->get_wh; 797 my ($ws, $hs) = $self->get_wh;
653 798
654 ( 799 (
655 (List::Util::sum @$ws), 800 (sum @$ws),
656 (List::Util::sum @$hs), 801 (sum @$hs),
657 ) 802 )
658} 803}
659 804
660sub size_allocate { 805sub size_allocate {
661 my ($self, $x, $y, $w, $h) = @_; 806 my ($self, $x, $y, $w, $h) = @_;
662 807
663 $self->_size_allocate ($x, $y, $w, $h) or return; 808 $self->_size_allocate ($x, $y, $w, $h) or return;
664 809
665 my ($ws, $hs) = $self->get_wh; 810 my ($ws, $hs) = $self->get_wh;
666 811
667 my $req_w = List::Util::sum @$ws; 812 my $req_w = sum @$ws;
668 my $req_h = List::Util::sum @$hs; 813 my $req_h = sum @$hs;
814
815 # TODO: nicer code && do row_expand
816 my @col_expand = @{$self->{col_expand}};
817 @col_expand = (1) x @$ws unless @col_expand;
818 my $col_expand = (sum @col_expand) || 1;
669 819
670 # linearly scale sizes 820 # linearly scale sizes
671 $_ *= $req_w / $w for @$ws; 821 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
672 $_ *= $req_h / $h for @$hs; 822 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
823
824 CFClient::UI::harmonize $ws;
825 CFClient::UI::harmonize $hs;
673 826
674 my $y; 827 my $y;
675 828
676 for my $r (0 .. $#{$self->{children}}) { 829 for my $r (0 .. $#{$self->{children}}) {
677 my $row = $self->{children}[$r] 830 my $row = $self->{children}[$r]
679 832
680 my $x = 0; 833 my $x = 0;
681 my $row_h = $hs->[$r]; 834 my $row_h = $hs->[$r];
682 835
683 for my $c (0 .. $#$row) { 836 for my $c (0 .. $#$row) {
684 my $widget = $row->[$c]
685 or next;
686
687 my $col_w = $ws->[$c]; 837 my $col_w = $ws->[$c];
688 838
839 if (my $widget = $row->[$c]) {
689 $widget->size_allocate ($x, $y, $col_w, $row_h); 840 $widget->size_allocate ($x, $y, $col_w, $row_h);
841 }
690 842
691 $x += $col_w; 843 $x += $col_w;
692 } 844 }
693 845
694 $y += $row_h; 846 $y += $row_h;
695 } 847 }
696 848
697} 849}
698 850
851sub find_widget {
852 my ($self, $x, $y) = @_;
853
854 $x -= $self->{x};
855 $y -= $self->{y};
856
857 my $res;
858
859 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
860 $res = $_->find_widget ($x, $y)
861 and return $res;
862 }
863
864 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
865}
866
699sub _draw { 867sub _draw {
700 my ($self) = @_; 868 my ($self) = @_;
701 869
702 for (grep $_, @{$self->{children}}) { 870 for (grep $_, @{$self->{children}}) {
703 $_->draw for grep $_, @$_; 871 $_->draw for grep $_, @$_;
704 } 872 }
705} 873}
706 874
707############################################################################# 875#############################################################################
708 876
877package CFClient::UI::HBox;
878
879# TODO: wrap into common Box base class
880
881our @ISA = CFClient::UI::Container::;
882
883sub size_request {
884 my ($self) = @_;
885
886 my @alloc = map [$_->size_request], @{$self->{children}};
887
888 (
889 (List::Util::sum map $_->[0], @alloc),
890 (List::Util::max map $_->[1], @alloc),
891 )
892}
893
894sub size_allocate {
895 my ($self, $x, $y, $w, $h) = @_;
896
897 $self->_size_allocate ($x, $y, $w, $h) or return;
898
899 ($h, $w) = ($w, $h);
900
901 my $children = $self->{children};
902
903 my @h = map +($_->size_request)[0], @$children;
904
905 my $req_h = List::Util::sum @h;
906
907 if ($req_h > $h) {
908 # ah well, not enough space
909 $_ *= $h / $req_h for @h;
910 } else {
911 my $exp = List::Util::sum map $_->{expand}, @$children;
912 $exp ||= 1;
913
914 for (0 .. $#$children) {
915 my $child = $children->[$_];
916
917 my $alloc_h = $h[$_];
918 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
919 $h[$_] = $alloc_h;
920 }
921 }
922
923 CFClient::UI::harmonize \@h;
924
925 my $y = 0;
926 for (0 .. $#$children) {
927 my $child = $children->[$_];
928 my $h = $h[$_];
929 $child->size_allocate ($y, 0, $h, $w);
930
931 $y += $h;
932 }
933
934 1
935}
936
937#############################################################################
938
709package CFClient::UI::VBox; 939package CFClient::UI::VBox;
710 940
941# TODO: wrap into common Box base class
942
711our @ISA = CFClient::UI::Container::; 943our @ISA = CFClient::UI::Container::;
712
713use SDL::OpenGL;
714 944
715sub size_request { 945sub size_request {
716 my ($self) = @_; 946 my ($self) = @_;
717 947
718 my @alloc = map [$_->size_request], @{$self->{children}}; 948 my @alloc = map [$_->size_request], @{$self->{children}};
726sub size_allocate { 956sub size_allocate {
727 my ($self, $x, $y, $w, $h) = @_; 957 my ($self, $x, $y, $w, $h) = @_;
728 958
729 $self->_size_allocate ($x, $y, $w, $h) or return; 959 $self->_size_allocate ($x, $y, $w, $h) or return;
730 960
731 return unless $self->{h};
732
733 my $children = $self->{children}; 961 my $children = $self->{children};
734 962
735 my @h = map +($_->size_request)[1], @$children; 963 my @h = map +($_->size_request)[1], @$children;
736 964
737 my $req_h = List::Util::sum @h; 965 my $req_h = List::Util::sum @h;
738 966
739 if ($req_h > $h) { 967 if ($req_h > $h) {
740 # ah well, not enough space 968 # ah well, not enough space
741 $_ = $h[$_] * $h / $req_h for @h; 969 $_ *= $h / $req_h for @h;
742 } else { 970 } else {
743 my @exp = grep $_->{expand}, @$children; 971 my $exp = List::Util::sum map $_->{expand}, @$children;
744 @exp = @$children unless @exp; 972 $exp ||= 1;
745 973
746 my %exp = map +($_ => 1), @exp;
747
748 for (0 .. $#$children) { 974 for (0 .. $#$children) {
749 my $child = $children->[$_]; 975 my $child = $children->[$_];
750 976
751 my $alloc_h = $h[$_]; 977 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
752 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
753 $h[$_] = $alloc_h;
754 } 978 }
755 } 979 }
980
981 CFClient::UI::harmonize \@h;
756 982
757 my $y = 0; 983 my $y = 0;
758 for (0 .. $#$children) { 984 for (0 .. $#$children) {
759 my $child = $children->[$_]; 985 my $child = $children->[$_];
760 my $h = $h[$_]; 986 my $h = $h[$_];
761 $child->size_allocate (0, $y, $w, $h); 987 $child->size_allocate (0, $y, $w, $h);
762 988
763 $y += $h; 989 $y += $h;
764 } 990 }
991
992 1
765} 993}
766 994
767############################################################################# 995#############################################################################
768 996
769package CFClient::UI::Label; 997package CFClient::UI::Label;
774 1002
775sub new { 1003sub new {
776 my ($class, %arg) = @_; 1004 my ($class, %arg) = @_;
777 1005
778 my $self = $class->SUPER::new ( 1006 my $self = $class->SUPER::new (
779 fg => [1, 1, 1], 1007 fg => [1, 1, 1],
780 height => $::FONTSIZE, 1008 fontsize => $::FONTSIZE,
781 text => "", 1009 text => "",
782 align => -1, 1010 align => -1,
1011 valign => -1,
1012 padding => 2,
783 layout => new CFClient::Layout, 1013 layout => new CFClient::Layout,
784 %arg 1014 %arg
785 ); 1015 );
786 1016
787 $self->set_text ($self->{text}); 1017 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1018
1019 $self->set_text (delete $self->{text}) if exists $self->{text};
1020 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
788 1021
789 $self 1022 $self
790} 1023}
791 1024
792sub escape_text { 1025sub escape_text {
800} 1033}
801 1034
802sub set_text { 1035sub set_text {
803 my ($self, $text) = @_; 1036 my ($self, $text) = @_;
804 1037
805 $self->{text} = $text;
806 $self->{layout}->set_markup ($text); 1038 $self->{layout}->set_text ($text);
807 1039
808 delete $self->{texture}; 1040 delete $self->{texture};
809 $self->update; 1041 $self->update;
810} 1042}
811 1043
812sub get_text { 1044sub set_markup {
813 my ($self, $text) = @_; 1045 my ($self, $markup) = @_;
814 1046
815 $self->{text} 1047 $self->{layout}->set_markup ($markup);
1048
1049 delete $self->{texture};
1050 $self->update;
816} 1051}
817 1052
818sub size_request { 1053sub size_request {
819 my ($self) = @_; 1054 my ($self) = @_;
820 1055
821 $self->{layout}->set_width; 1056 $self->{layout}->set_width;
822 $self->{layout}->set_height ($self->{height}); 1057 $self->{layout}->set_height ($self->{fontsize});
1058
823 $self->{layout}->size 1059 my ($w, $h) = $self->{layout}->size;
824# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 1060
825# ( 1061 (
826# $self->{texture}{w}, 1062 $w + $self->{padding} * 2,
827# $self->{texture}{h}, 1063 $h + $self->{padding} * 2,
828# ) 1064 )
829# } else {
830# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831#
832# ($w, $h)
833# }
834} 1065}
835 1066
836sub size_allocate { 1067sub size_allocate {
837 my ($self, $x, $y, $w, $h) = @_; 1068 my ($self, $x, $y, $w, $h) = @_;
838 1069
851sub _draw { 1082sub _draw {
852 my ($self) = @_; 1083 my ($self) = @_;
853 1084
854 my $tex = $self->{texture} ||= do { 1085 my $tex = $self->{texture} ||= do {
855 $self->{layout}->set_width ($self->{w}); 1086 $self->{layout}->set_width ($self->{w});
1087 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
856 new_from_layout CFClient::Texture $self->{layout} 1088 new_from_layout CFClient::Texture $self->{layout}
857 }; 1089 };
858 1090
859 glEnable GL_BLEND; 1091 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1092 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1093 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1094 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 1095
864 glColor @{$self->{fg}}; 1096 glColor @{$self->{fg}};
865 1097
866 my $x = 1098 $self->{ox} = int (
867 $self->{align} < 0 ? 0 1099 $self->{align} < 0 ? $self->{padding}
868 : $self->{align} > 0 ? $self->{w} - $tex->{w} 1100 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869 : ($self->{w} - $tex->{w}) * 0.5; 1101 : ($self->{w} - $tex->{w}) * 0.5
1102 );
870 1103
871 $tex->draw_quad ($x, 0); 1104 $self->{oy} = int (
1105 $self->{valign} < 0 ? $self->{padding}
1106 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1107 : ($self->{h} - $tex->{h}) * 0.5
1108 );
1109
1110 $tex->draw_quad ($self->{ox}, $self->{oy});
872 1111
873 glDisable GL_TEXTURE_2D; 1112 glDisable GL_TEXTURE_2D;
874 glDisable GL_BLEND; 1113 glDisable GL_BLEND;
875} 1114}
876 1115
877############################################################################# 1116#############################################################################
878 1117
879package CFClient::UI::Entry; 1118package CFClient::UI::EntryBase;
880 1119
881our @ISA = CFClient::UI::Label::; 1120our @ISA = CFClient::UI::Label::;
882 1121
883use SDL; 1122use SDL;
884use SDL::OpenGL; 1123use SDL::OpenGL;
886sub new { 1125sub new {
887 my $class = shift; 1126 my $class = shift;
888 1127
889 $class->SUPER::new ( 1128 $class->SUPER::new (
890 fg => [1, 1, 1], 1129 fg => [1, 1, 1],
891 bg => [0, 0, 0, 0.4], 1130 bg => [0, 0, 0, 0.2],
892 active_bg => [1, 1, 1], 1131 active_bg => [1, 1, 1, 0.5],
893 active_fg => [0, 0, 0], 1132 active_fg => [0, 0, 0],
1133 can_hover => 1,
1134 can_focus => 1,
1135 valign => 0,
894 @_ 1136 @_
895 ) 1137 )
896} 1138}
897 1139
898sub _set_text { 1140sub _set_text {
899 my ($self, $text) = @_; 1141 my ($self, $text) = @_;
900 1142
1143 delete $self->{cur_h};
1144
1145 return if $self->{text} eq $text;
1146
901 $self->{last_activity} = $::NOW; 1147 $self->{last_activity} = $::NOW;
902
903 $self->{text} = $text; 1148 $self->{text} = $text;
904 $self->{layout}->set_width ($self->{w});
905 1149
906 $text =~ s/./*/g if $self->{hidden}; 1150 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text ");
907 1152
1153 $self->emit (changed => $self->{text});
1154}
908 1155
909 $self->{layout}->set_markup ($self->escape_text ($text)); 1156sub get_text {
910 1157 $_[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} 1158}
916 1159
917sub size_request { 1160sub size_request {
918 my ($self) = @_; 1161 my ($self) = @_;
919 1162
923} 1166}
924 1167
925sub size_allocate { 1168sub size_allocate {
926 my ($self, $x, $y, $w, $h) = @_; 1169 my ($self, $x, $y, $w, $h) = @_;
927 1170
928 $self->SUPER::size_allocate ($x, $y, $w, $h); 1171 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
929 1172
930 $self->_set_text ($self->{text}); 1173 $self->_set_text ($self->{text});
931} 1174}
932 1175
933sub set_text { 1176sub set_text {
954 substr $text, $self->{cursor}, 1, ""; 1197 substr $text, $self->{cursor}, 1, "";
955 } elsif ($sym == SDLK_LEFT) { 1198 } elsif ($sym == SDLK_LEFT) {
956 --$self->{cursor} if $self->{cursor}; 1199 --$self->{cursor} if $self->{cursor};
957 } elsif ($sym == SDLK_RIGHT) { 1200 } elsif ($sym == SDLK_RIGHT) {
958 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1201 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1202 } elsif ($sym == SDLK_HOME) {
1203 $self->{cursor} = 0;
1204 } elsif ($sym == SDLK_END) {
1205 $self->{cursor} = length $text;
1206 } elsif ($sym == SDLK_ESCAPE) {
1207 $self->emit ('escape');
959 } elsif ($uni) { 1208 } elsif ($uni) {
960 substr $text, $self->{cursor}++, 0, chr $uni; 1209 substr $text, $self->{cursor}++, 0, chr $uni;
961 } 1210 }
962 1211
963 $self->_set_text ($text); 1212 $self->_set_text ($text);
978 $self->SUPER::button_down ($ev, $x, $y); 1227 $self->SUPER::button_down ($ev, $x, $y);
979 1228
980 my $idx = $self->{layout}->xy_to_index ($x, $y); 1229 my $idx = $self->{layout}->xy_to_index ($x, $y);
981 1230
982 # byte-index to char-index 1231 # byte-index to char-index
983 my $text = $self->{layout}; 1232 my $text = $self->{text};
984 utf8::encode $text; 1233 utf8::encode $text;
985 $self->{cursor} = length substr $text, 0, $idx; 1234 $self->{cursor} = length substr $text, 0, $idx;
986 1235
987 $self->_set_text ($self->{text}); 1236 $self->_set_text ($self->{text});
988 $self->update; 1237 $self->update;
1003 $self->{fg} = $self->{active_fg}; 1252 $self->{fg} = $self->{active_fg};
1004 } else { 1253 } else {
1005 glColor @{$self->{bg}}; 1254 glColor @{$self->{bg}};
1006 } 1255 }
1007 1256
1257 glEnable GL_BLEND;
1258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008 glBegin GL_QUADS; 1259 glBegin GL_QUADS;
1009 glVertex 0 , 0; 1260 glVertex 0 , 0;
1010 glVertex 0 , $self->{h}; 1261 glVertex 0 , $self->{h};
1011 glVertex $self->{w}, $self->{h}; 1262 glVertex $self->{w}, $self->{h};
1012 glVertex $self->{w}, 0; 1263 glVertex $self->{w}, 0;
1013 glEnd; 1264 glEnd;
1265 glDisable GL_BLEND;
1014 1266
1015 $self->SUPER::_draw; 1267 $self->SUPER::_draw;
1016 1268
1017 #TODO: force update every cursor change :( 1269 #TODO: force update every cursor change :(
1018 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1270 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1271
1272 unless (exists $self->{cur_h}) {
1273 my $text = substr $self->{text}, 0, $self->{cursor};
1274 utf8::encode $text;
1275
1276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1277 }
1278
1019 glColor @{$self->{fg}}; 1279 glColor @{$self->{fg}};
1020 glBegin GL_LINES; 1280 glBegin GL_LINES;
1021 glVertex $self->{cur_x}, $self->{cur_y};
1022 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1281 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1282 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1023 glEnd; 1283 glEnd;
1024 } 1284 }
1025} 1285}
1026 1286
1027#############################################################################
1028
1029package CFClient::UI::Slider; 1287package CFClient::UI::Entry;
1030 1288
1031use strict; 1289our @ISA = CFClient::UI::EntryBase::;
1032 1290
1291use SDL;
1033use SDL::OpenGL; 1292use SDL::OpenGL;
1034 1293
1035our @ISA = CFClient::UI::DrawBG::; 1294sub key_down {
1036
1037sub size_request {
1038 my ($self) = @_; 1295 my ($self, $ev) = @_;
1039 1296
1040 my $w = 50; 1297 my $sym = $ev->key_sym;
1041 my $h = 10;
1042 1298
1043 $self->{vertical} ? ($h, $w) : ($w, $h) 1299 if ($sym == SDLK_RETURN) {
1300 $self->emit (activate => $self->get_text);
1301 $self->update;
1302
1303 } else {
1304 $self->SUPER::key_down ($ev);
1305 }
1306
1044} 1307}
1308
1309#############################################################################
1310
1311package CFClient::UI::Button;
1312
1313our @ISA = CFClient::UI::Label::;
1314
1315use SDL;
1316use SDL::OpenGL;
1317
1318my @tex =
1319 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1320 qw(b1_button_active.png);
1045 1321
1046sub new { 1322sub new {
1047 my $class = shift; 1323 my $class = shift;
1048 1324
1325 $class->SUPER::new (
1326 padding => 4,
1327 fg => [1, 1, 1],
1328 bg => [1, 1, 1, 0.2],
1329 active_fg => [0, 0, 1],
1330 can_hover => 1,
1331 align => 0,
1332 valign => 0,
1333 @_
1334 )
1335}
1336
1337sub button_up {
1338 my ($self, $ev, $x, $y) = @_;
1339
1340 if ($x >= 0 && $x < $self->{w}
1341 && $y >= 0 && $y < $self->{h}) {
1342 $self->emit ("activate");
1343 }
1344}
1345
1346sub _draw {
1347 my ($self) = @_;
1348
1349 local $self->{fg} = $self->{fg};
1350
1351 if ($GRAB == $self) {
1352 $self->{fg} = $self->{active_fg};
1353 }
1354
1355 glEnable GL_BLEND;
1356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1357 glEnable GL_TEXTURE_2D;
1358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1359 glColor 0, 0, 0, 1;
1360
1361 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1362
1363 glDisable GL_TEXTURE_2D;
1364 glDisable GL_BLEND;
1365
1366 $self->SUPER::_draw;
1367}
1368
1369#############################################################################
1370
1371package CFClient::UI::CheckBox;
1372
1373our @ISA = CFClient::UI::DrawBG::;
1374
1375my @tex =
1376 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1377 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1378
1379use SDL;
1380use SDL::OpenGL;
1381
1382sub new {
1383 my $class = shift;
1384
1385 $class->SUPER::new (
1386 padding => 2,
1387 fg => [1, 1, 1],
1388 active_fg => [1, 1, 0],
1389 state => 0,
1390 can_hover => 1,
1391 @_
1392 )
1393}
1394
1395sub size_request {
1396 my ($self) = @_;
1397
1398 ($self->{padding} * 2 + 6) x 2
1399}
1400
1401sub size_allocate {
1402 my ($self, $x, $y, $w, $h) = @_;
1403
1404 $self->_size_allocate ($x, $y, $w, $h) or return;
1405}
1406
1407sub button_down {
1408 my ($self, $ev, $x, $y) = @_;
1409
1410 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1411 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1412 $self->{state} = !$self->{state};
1413 $self->emit (changed => $self->{state});
1414 }
1415}
1416
1417sub _draw {
1418 my ($self) = @_;
1419
1420 $self->SUPER::_draw;
1421
1422 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1423
1424 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1425
1426 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1427
1428 glEnable GL_BLEND;
1429 glEnable GL_TEXTURE_2D;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431
1432 my $tex = $self->{state} ? $tex[1] : $tex[0];
1433
1434 $tex->draw_quad (0, 0, $s, $s);
1435
1436 glDisable GL_TEXTURE_2D;
1437 glDisable GL_BLEND;
1438}
1439
1440#############################################################################
1441
1442package CFClient::UI::VGauge;
1443
1444our @ISA = CFClient::UI::Base::;
1445
1446use SDL::OpenGL;
1447
1448my %tex = (
1449 food => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1452 ],
1453 grace => [
1454 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1455 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1456 ],
1457 hp => [
1458 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1459 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1460 ],
1461 mana => [
1462 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1463 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1464 ],
1465);
1466
1467# eg. VGauge->new (gauge => 'food'), default gauge: food
1468sub new {
1469 my $class = shift;
1470
1471 my $self = $class->SUPER::new (gauge => 'food', @_);
1472
1473 $self
1474}
1475
1476sub size_request {
1477 my ($self) = @_;
1478
1479 my $tex = $tex{$self->{gauge}}[0];
1480
1481 @$tex{qw(w h)}
1482}
1483
1484sub set_max {
1485 my ($self, $max) = @_;
1486
1487 $self->{max_val} = $max;
1488}
1489
1490sub set_value {
1491 my ($self, $val, $max) = @_;
1492
1493 $self->set_max ($max)
1494 if defined $max;
1495
1496 $max = $self->{max_val};
1497 $self->{val} = $val;
1498
1499 $self->update;
1500}
1501
1502sub _draw {
1503 my ($self) = @_;
1504
1505 my $tex = $tex{$self->{gauge}};
1506
1507 my ($w, $h) = ($self->{w}, $self->{h});
1508
1509 my $ycut = $self->{val} / ($self->{max_val} || 1);
1510 $ycut = 1 if $self->{val} > $self->{max_val};
1511
1512 my $t1 = $tex->[0];
1513 my $t2 = $tex->[1];
1514
1515 glEnable GL_BLEND;
1516 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1517 glEnable GL_TEXTURE_2D;
1518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1519
1520 my $h1 = $self->{h} - $ycut * $self->{h};
1521 my $h2 = $ycut * $self->{h};
1522
1523 my $yp = 0;
1524
1525 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1526 glBegin (GL_QUADS);
1527 glTexCoord (0, 0); glVertex (0 , $yp);
1528 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1529 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1530 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1531 glEnd ();
1532
1533 $yp += $h1;
1534
1535 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1536 glBegin (GL_QUADS);
1537 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1538 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1539 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1540 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1541 glEnd ();
1542
1543 glDisable GL_BLEND;
1544 glDisable GL_TEXTURE_2D;
1545}
1546
1547#############################################################################
1548
1549package CFClient::UI::Slider;
1550
1551use strict;
1552
1553use SDL::OpenGL;
1554
1555our @ISA = CFClient::UI::DrawBG::;
1556
1557my @tex =
1558 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1559 qw(s1_slider.png s1_slider_bg.png);
1560
1561sub new {
1562 my $class = shift;
1563
1049 # range [value, low, high, page] 1564 # range [value, low, high, page]
1050 1565
1566 # TODO: 0-width page
1567 # TODO: req_w/h are wrong with vertical
1568 # TODO: calculations are off
1051 $class->SUPER::new ( 1569 my $self = $class->SUPER::new (
1052 fg => [1, 1, 1], 1570 fg => [1, 1, 1],
1053 active_fg => [0, 0, 0], 1571 active_fg => [0, 0, 0],
1054 range => [0, 0, 100, 10], 1572 range => [0, 0, 100, 10],
1573 req_w => 40,
1574 req_h => 13,
1055 vertical => 1, 1575 vertical => 0,
1576 can_hover => 1,
1577 inner_pad => 5,
1056 @_ 1578 @_
1057 ) 1579 );
1580
1581 $self
1582}
1583
1584sub size_request {
1585 my ($self) = @_;
1586
1587 my $w = $self->{req_w};
1588 my $h = $self->{req_h};
1589
1590 $self->{vertical} ? ($h, $w) : ($w, $h)
1058} 1591}
1059 1592
1060sub button_down { 1593sub button_down {
1061 my ($self, $ev, $x, $y) = @_; 1594 my ($self, $ev, $x, $y) = @_;
1062 1595
1070 if ($GRAB == $self) { 1603 if ($GRAB == $self) {
1071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1604 my ($value, $lo, $hi, $page) = @{$self->{range}};
1072 1605
1073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1606 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074 1607
1608 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1609 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1610
1611 $x -= $inner_pad_px; # substract the padding
1075 $x = $x * ($hi - $lo) / $w + $lo; 1612 $x = $x * ($hi - $lo) / $inner_w + $lo;
1076 $x = $lo if $x < $lo; 1613 $x = $lo if $x < $lo;
1077 $x = $hi - $page if $x > $hi - $page; 1614 $x = $hi - $page if $x > $hi - $page;
1078 $self->{range}[0] = $x; 1615 $self->{range}[0] = $x;
1079 1616
1080 $self->emit (changed => $x); 1617 $self->emit (changed => $x);
1081 $self->update; 1618 $self->update;
1082 } 1619 }
1620}
1621
1622# the inner_* stuff is for generating a padding for the slider handle,
1623# so that the handle doesn't leave the texture. This calculation isn't 100%
1624# correct propably, but it does the job for now
1625sub _calc_inner_pad_px {
1626 my ($self, $w) = @_;
1627 ($w / 100) * $self->{inner_pad} # % to pixels
1083} 1628}
1084 1629
1085sub _draw { 1630sub _draw {
1086 my ($self) = @_; 1631 my ($self) = @_;
1087 1632
1101 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1646 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1647 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103 1648
1104 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1649 my ($value, $lo, $hi, $page) = @{$self->{range}};
1105 1650
1651 $hi = $value + 1 if $lo == $hi;
1652
1653 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1654 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1655
1106 $page = int $page * $w / ($hi - $lo); 1656 $page = int $page * $inner_w / ($hi - $lo);
1107 $value = int +($value - $lo) * $w / ($hi - $lo); 1657 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108 1658
1109 $w -= $page; 1659 $w -= $page;
1110 $page &= ~1; 1660 $page &= ~1;
1111 glTranslate $page * 0.5, 0, 0; 1661 glTranslate $page * 0.5, 0, 0;
1662 $page ||= 2;
1112 1663
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; 1664 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121 my $knob_b = $value + $page * 0.5; 1665 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122 1666
1123 glBegin GL_QUADS; 1667 glEnable GL_BLEND;
1124 glColor @$fg; 1668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125 glVertex $knob_a, 0; 1669 glEnable GL_TEXTURE_2D;
1126 glVertex $knob_a, $h; 1670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127 glVertex $knob_b, $h;
1128 glVertex $knob_b, 0;
1129 1671
1130 if ($knob_a < $knob_b - 2) { 1672 # draw background
1131 glColor @$bg; 1673 $tex[1]->draw_quad (0, 0, $w, $h);
1132 glVertex $knob_a + 1, 1; 1674
1133 glVertex $knob_a + 1, $h - 1; 1675 # draw handle
1134 glVertex $knob_b - 1, $h - 1; 1676 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135 glVertex $knob_b - 1, 1; 1677
1678 glDisable GL_BLEND;
1679 glDisable GL_TEXTURE_2D;
1680}
1681
1682#############################################################################
1683
1684package CFClient::UI::TextView;
1685
1686our @ISA = CFClient::UI::HBox::;
1687
1688use SDL::OpenGL;
1689
1690sub new {
1691 my $class = shift;
1692
1693 my $self = $class->SUPER::new (
1694 req_w => $::WIDTH / 6,
1695 req_h => $::HEIGHT / 6,
1696 fontsize => $::FONTSIZE,
1697 @_,
1698
1699 layout => (new CFClient::Layout),
1700 par => [],
1701 height => 0,
1702 children => [
1703 (new CFClient::UI::Empty expand => 1),
1704 (new CFClient::UI::Slider vertical => 1),
1705 ],
1706 );
1707
1708 $self->{children}[1]->connect (changed => sub {
1709 $self->update;
1710 });
1711
1712 $self
1713}
1714
1715sub set_fontsize {
1716 my ($self, $fontsize) = @_;
1717
1718 $self->{fontsize} = $fontsize;
1719 $self->reflow;
1720}
1721
1722sub text_height {
1723 my ($self, $text) = @_;
1724
1725 my $layout = $self->{layout};
1726
1727 $layout->set_height ($self->{fontsize});
1728 $layout->set_width ($self->{w});
1729 $layout->set_text ($text);
1136 } 1730
1137 glEnd; 1731 ($layout->size)[1]
1732}
1733
1734sub reflow {
1735 my ($self) = @_;
1736
1737 $self->{need_reflow}++;
1738 $self->update;
1739}
1740
1741sub size_request {
1742 my ($self) = @_;
1743
1744 ($self->{req_w}, $self->{req_h})
1745}
1746
1747sub size_allocate {
1748 my ($self, $x, $y, $w, $h) = @_;
1749
1750 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1751
1752 $self->{layout}->set_height ($self->{fontsize});
1753 $self->{layout}->set_width ($self->{w});
1754
1755 $self->reflow;
1756 $self->update;
1757}
1758
1759sub add_paragraph {
1760 my ($self, $color, $text) = @_;
1761
1762 #TODO: intelligently "reformat" paragraph
1763
1764 my $height = $self->text_height ($text);
1765
1766 $self->{height} += $height;
1767
1768 push @{$self->{par}}, [$height, $color, $text];
1769
1770 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1771 $self->{children}[1]->update;
1772}
1773
1774sub update {
1775 my ($self) = @_;
1776
1777 $self->SUPER::update;
1778
1779 return unless $self->{h} > 0;
1780
1781 delete $self->{texture};
1782
1783 $ROOT->on_refresh ($self, sub {
1784 if (delete $self->{need_reflow}) {
1785 my $height = 0;
1786
1787 $height += $_->[0] = $self->text_height ($_->[2])
1788 for @{$self->{par}};
1789
1790 $self->{height} = $height;
1791
1792 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1793
1794 delete $self->{texture};
1795 }
1796
1797 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1798 glClearColor 0, 0, 0, 1;
1799 glClear GL_COLOR_BUFFER_BIT;
1800
1801 glEnable GL_BLEND;
1802 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1803 glEnable GL_TEXTURE_2D;
1804 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1805
1806 my $top = int $self->{children}[1]{range}[0];
1807
1808 my $y0 = $top;
1809 my $y1 = $top + $self->{h};
1810
1811 my $y = 0;
1812
1813 my $layout = $self->{layout};
1814
1815 for my $par (@{$self->{par}}) {
1816 my $h = $par->[0];
1817
1818 if ($y0 < $y + $h && $y < $y1) {
1819 $layout->set_text ($par->[2]);
1820
1821 glColor @{ $par->[1] };
1822 my ($W, $H) = $layout->size;
1823 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1824 }
1825
1826 $y += $h;
1827 }
1828
1829 glDisable GL_TEXTURE_2D;
1830 glDisable GL_BLEND;
1831 };
1832 });
1833}
1834
1835sub _draw {
1836 my ($self) = @_;
1837
1838 if ($self->{texture}) {
1839 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1842 glDisable GL_TEXTURE_2D;
1843 }
1844
1845 $self->{children}[1]->draw;
1846
1138} 1847}
1139 1848
1140############################################################################# 1849#############################################################################
1141 1850
1142package CFClient::UI::MapWidget; 1851package CFClient::UI::MapWidget;
1152 1861
1153sub new { 1862sub new {
1154 my $class = shift; 1863 my $class = shift;
1155 1864
1156 $class->SUPER::new ( 1865 $class->SUPER::new (
1157 z => -1, 1866 z => -1,
1867 can_focus => 1,
1158 list => (glGenLists 1), 1868 list => (glGenLists 1),
1159 @_ 1869 @_
1160 ) 1870 )
1161} 1871}
1162 1872
1163sub key_down { 1873sub key_down {
1165} 1875}
1166 1876
1167sub key_up { 1877sub key_up {
1168} 1878}
1169 1879
1880sub button_down {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->focus_in;
1884
1885 if ($ev->button == 2) {
1886 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1887 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1888
1889 $self->{motion} = sub {
1890 my ($ev, $x, $y) = @_;
1891
1892 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1893
1894 $::CFG->{map_shift_x} = $bw + $x - $ox;
1895 $::CFG->{map_shift_y} = $bh + $y - $oy;
1896
1897 $self->update;
1898 };
1899 }
1900}
1901
1902sub button_up {
1903 my ($self, $ev, $x, $y) = @_;
1904
1905 delete $self->{motion};
1906}
1907
1908sub mouse_motion {
1909 my ($self, $ev, $x, $y) = @_;
1910
1911 $self->{motion}->($ev, $x, $y) if $self->{motion};
1912}
1913
1170sub size_request { 1914sub size_request {
1171 ( 1915 (
1172 1 + int $::WIDTH / 32, 1916 1 + 32 * int $::WIDTH / 32,
1173 1 + int $::HEIGHT / 32, 1917 1 + 32 * int $::HEIGHT / 32,
1174 ) 1918 )
1175} 1919}
1176 1920
1177sub update { 1921sub update {
1178 my ($self) = @_; 1922 my ($self) = @_;
1179 1923
1180 $self->{need_update} = 1; 1924 $self->{need_update} = 1;
1181 $self->SUPER::update; 1925 $self->SUPER::update;
1182} 1926}
1183 1927
1184sub _draw { 1928sub draw {
1185 my ($self) = @_; 1929 my ($self) = @_;
1186 1930
1187 if (delete $self->{need_update}) { 1931 if (delete $self->{need_update}) {
1188 glNewList $self->{list}, GL_COMPILE; 1932 glNewList $self->{list}, GL_COMPILE;
1189 1933
1190 my $mx = $::CONN->{mapx}; 1934 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; 1935 my $sw = int $::WIDTH / 32;
1198 my $sh = 1 + int $::HEIGHT / 32; 1936 my $sh = int $::HEIGHT / 32;
1199 1937
1200 if ($::CONN->{mapw} > $sw) { 1938 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1201 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1939 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1202 } else { 1940
1203 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1941 glTranslate $sx0 - 32, $sy0 - 32, 0;
1942
1943 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1944
1945 if ($::CFG->{fow_enable}) {
1946 if ($::CFG->{fow_smooth}) { # smooth fog of war
1947 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1948 glConvolutionFilter2D
1949 GL_CONVOLUTION_2D,
1950 GL_ALPHA,
1951 3, 3,
1952 GL_ALPHA, GL_FLOAT,
1953 pack "f*",
1954 0.1, 0.1, 0.1,
1955 0.1, 0.2, 0.1,
1956 0.1, 0.1, 0.1,
1957 ;
1958 glEnable GL_CONVOLUTION_2D;
1959 }
1960
1961 $self->{fow_texture} = new CFClient::Texture
1962 w => $w,
1963 h => $h,
1964 data => $data,
1965 internalformat => GL_ALPHA,
1966 format => GL_ALPHA;
1967
1968 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1969
1970 glEnable GL_BLEND;
1971 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1972 glEnable GL_TEXTURE_2D;
1973 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1974
1975 glColor +($::CFG->{fow_intensity}) x 3, 1;
1976 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1977
1978 glDisable GL_TEXTURE_2D;
1979 glDisable GL_BLEND;
1980 }
1981
1982 # HACK BEGIN
1983 {
1984 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1985 my ($w, $h) = (250, 250);
1986
1987 glEnable GL_BLEND;
1988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1989 glEnable GL_TEXTURE_2D;
1990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1991
1992 $self->{mapmap_texture} =
1993 new CFClient::Texture
1994 w => $w,
1995 h => $h,
1996 data => $::MAP->mapmap ($w, $h),
1997 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1998
1999 $self->{mapmap_texture}->draw_quad (100, 100);
2000
2001 glDisable GL_TEXTURE_2D;
2002 glDisable GL_BLEND;
2003 }
2004 # HACK END
1204 } 2005 }
1205 2006
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; 2007 glEndList;
1270 } 2008 }
1271 2009
2010 glPushMatrix;
1272 glCallList $self->{list}; 2011 glCallList $self->{list};
2012 glPopMatrix;
2013
2014 if ($FOCUS != $self) {
2015 glColor 64/255, 64/255, 64/255;
2016 glLogicOp GL_AND;
2017 glEnable GL_COLOR_LOGIC_OP;
2018 glBegin GL_QUADS;
2019 glVertex 0, 0;
2020 glVertex 0, $::HEIGHT;
2021 glVertex $::WIDTH, $::HEIGHT;
2022 glVertex $::WIDTH, 0;
2023 glEnd;
2024 glDisable GL_COLOR_LOGIC_OP;
2025 }
1273} 2026}
1274 2027
1275my %DIR = ( 2028my %DIR = (
1276 SDLK_KP8, [1, "north"], 2029 SDLK_KP8, [1, "north"],
1277 SDLK_KP9, [2, "northeast"], 2030 SDLK_KP9, [2, "northeast"],
1293 2046
1294 my $mod = $ev->key_mod; 2047 my $mod = $ev->key_mod;
1295 my $sym = $ev->key_sym; 2048 my $sym = $ev->key_sym;
1296 2049
1297 if ($sym == SDLK_KP5) { 2050 if ($sym == SDLK_KP5) {
1298 $::CONN->send ("command stay fire"); 2051 $::CONN->user_send ("stay fire");
2052 } elsif ($sym == SDLK_a) {
2053 $::CONN->user_send ("apply");
2054 } elsif ($sym == SDLK_QUOTE) {
2055 $self->emit ('activate_console');
2056 } elsif ($sym == SDLK_SLASH) {
2057 $self->emit ('activate_console' => '/');
1299 } elsif (exists $DIR{$sym}) { 2058 } elsif (exists $DIR{$sym}) {
1300 if ($mod & KMOD_SHIFT) { 2059 if ($mod & KMOD_SHIFT) {
1301 $self->{shft}++; 2060 $self->{shft}++;
1302 $::CONN->send ("command fire $DIR{$sym}[0]"); 2061 $::CONN->user_send ("fire $DIR{$sym}[0]");
1303 } elsif ($mod & KMOD_CTRL) { 2062 } elsif ($mod & KMOD_CTRL) {
1304 $self->{ctrl}++; 2063 $self->{ctrl}++;
1305 $::CONN->send ("command run $DIR{$sym}[0]"); 2064 $::CONN->user_send ("run $DIR{$sym}[0]");
1306 } else { 2065 } else {
1307 $::CONN->send ("command $DIR{$sym}[1]"); 2066 $::CONN->user_send ("$DIR{$sym}[1]");
1308 } 2067 }
1309 } 2068 }
1310} 2069}
1311 2070
1312sub key_up { 2071sub key_up {
1314 2073
1315 my $mod = $ev->key_mod; 2074 my $mod = $ev->key_mod;
1316 my $sym = $ev->key_sym; 2075 my $sym = $ev->key_sym;
1317 2076
1318 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2077 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319 $::CONN->send ("command fire_stop"); 2078 $::CONN->user_send ("fire_stop");
1320 } 2079 }
1321 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2080 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322 $::CONN->send ("command run_stop"); 2081 $::CONN->user_send ("run_stop");
1323 } 2082 }
1324} 2083}
1325 2084
1326############################################################################# 2085#############################################################################
1327 2086
1365 glPopMatrix; 2124 glPopMatrix;
1366} 2125}
1367 2126
1368############################################################################# 2127#############################################################################
1369 2128
1370package CFClient::UI::Toplevel; 2129package CFClient::UI::Flopper;
2130
2131our @ISA = CFClient::UI::Button::;
2132
2133sub new {
2134 my $class = shift;
2135
2136 my $self = $class->SUPER::new (
2137 state => 0,
2138 connect_activate => \&toggle_flopper,
2139 @_
2140 );
2141
2142 if ($self->{state}) {
2143 $self->{state} = 0;
2144 $self->toggle_flopper;
2145 }
2146
2147 $self
2148}
2149
2150sub toggle_flopper {
2151 my ($self) = @_;
2152
2153 # TODO: use animation
2154 if ($self->{state} = !$self->{state}) {
2155 $CFClient::UI::ROOT->add ($self->{other});
2156 $self->{other}->move ($self->coord2global (0, $self->{h}));
2157 $self->emit ("open");
2158 } else {
2159 $CFClient::UI::ROOT->remove ($self->{other});
2160 $self->emit ("close");
2161 }
2162
2163 $self->emit (changed => $self->{state});
2164}
2165
2166#############################################################################
2167
2168package CFClient::UI::Root;
1371 2169
1372our @ISA = CFClient::UI::Container::; 2170our @ISA = CFClient::UI::Container::;
2171
2172use SDL::OpenGL;
2173
2174sub check_size {
2175 my ($self) = @_;
2176
2177 $self->size_allocate (0, 0, $::WITH, $::HEIGHT);
2178}
1373 2179
1374sub size_request { 2180sub size_request {
1375 ($::WIDTH, $::HEIGHT) 2181 ($::WIDTH, $::HEIGHT)
1376} 2182}
1377 2183
1382 2188
1383 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2189 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1384 for @{$self->{children}}; 2190 for @{$self->{children}};
1385} 2191}
1386 2192
1387sub translate { 2193sub _topleft {
1388 my ($self, $x, $y) = @_; 2194 my ($self, $x, $y) = @_;
1389 2195
1390 ($x, $y) 2196 ($x, $y)
1391} 2197}
1392 2198
1393sub update { 2199sub update {
1394 my ($self) = @_; 2200 my ($self) = @_;
1395 2201
1396 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2202 $self->check_size;
1397 ::refresh (); 2203 ::refresh ();
1398} 2204}
1399 2205
1400sub add { 2206sub add {
1401 my ($self, $widget) = @_; 2207 my ($self, $widget) = @_;
1402 2208
1403 $self->SUPER::add ($widget); 2209 $self->SUPER::add ($widget);
1404 2210
1405 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2211 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2212}
2213
2214sub on_refresh {
2215 my ($self, $id, $cb) = @_;
2216
2217 $self->{refresh_hook}{$id} = $cb;
1406} 2218}
1407 2219
1408sub draw { 2220sub draw {
1409 my ($self) = @_; 2221 my ($self) = @_;
1410 2222
2223 while (my $rcb = delete $self->{refresh_hook}) {
2224 $_->() for values %$rcb;
2225 }
2226
2227 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2228 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2229 glClear GL_COLOR_BUFFER_BIT;
2230
2231 glMatrixMode GL_PROJECTION;
2232 glLoadIdentity;
2233 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2234 glMatrixMode GL_MODELVIEW;
2235 glLoadIdentity;
2236
1411 $self->_draw; 2237 $self->_draw;
1412} 2238}
1413 2239
1414############################################################################# 2240#############################################################################
1415 2241
1416package CFClient::UI; 2242package CFClient::UI;
1417 2243
1418$TOPLEVEL = new CFClient::UI::Toplevel; 2244$ROOT = new CFClient::UI::Root;
1419 2245
14201 22461
1421 2247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines