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.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.136 by root, Wed Apr 19 20:46:44 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_up ($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,
89 h => -1,
90 @_ 101 @_
91 }, $class 102 }, $class;
103
104 for (keys %$self) {
105 if (/^connect_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_});
107 }
108 }
109
110 $self
111}
112
113sub show {
114 my ($self) = @_;
115
116 return if $self->{parent};
117
118 $CFClient::UI::ROOT->add ($self);
119}
120
121sub hide {
122 my ($self) = @_;
123
124 return unless $self->{parent};
125
126 $self->{parent}->remove ($self);
92} 127}
93 128
94sub move { 129sub move {
95 my ($self, $x, $y, $z) = @_; 130 my ($self, $x, $y, $z) = @_;
131
96 $self->{x} = $x; 132 $self->{x} = int $x;
97 $self->{y} = $y; 133 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 134 $self->{z} = $z if defined $z;
135
136 $self->update;
99} 137}
100 138
101sub needs_redraw { 139sub needs_redraw {
102 0 140 0
103} 141}
… …
105sub size_request { 143sub size_request {
106 require Carp; 144 require Carp;
107 Carp::confess "size_request is abtract"; 145 Carp::confess "size_request is abtract";
108} 146}
109 147
110sub _size_allocate { 148sub configure {
111 my ($self, $x, $y, $w, $h) = @_; 149 my ($self, $x, $y, $w, $h) = @_;
112 150
113 $self->{x} = $x; 151 $self->{x} = $x;
114 $self->{y} = $y; 152 $self->{y} = $y;
115 153
116 return unless $self->{w} != $w || $self->{h} != $h; 154 return unless $self->{w} != $w || $self->{h} != $h;
117 155
118 $self->{w} = $w; 156 $self->{w} = $w;
119 $self->{h} = $h; 157 $self->{h} = $h;
120 158
121 1 159 $self->size_allocate ($w, $h);
160 $self->update;
122} 161}
123 162
124sub size_allocate { 163sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_; 164 # nothing to be done
126
127 $self->_size_allocate ($x, $y, $w, $h);
128} 165}
129 166
130# translate global koordinates to local coordinate system 167# return top left coordinates
131sub translate { 168sub _topleft {
132 my ($self, $x, $y) = @_; 169 my ($self, $x, $y) = @_;
133 170
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
172}
173
174# translate global coordinates to local coordinate system
175sub coord2local {
176 my ($self, $x, $y) = @_;
177
178 my ($X, $Y) = $self->_topleft;
179 ($x - $X, $y - $Y)
180}
181
182# translate local coordinates to global coordinate system
183sub coord2global {
184 my ($self, $x, $y) = @_;
185
186 my ($X, $Y) = $self->_topleft;
187 ($x + $X, $y + $Y)
135} 188}
136 189
137sub focus_in { 190sub focus_in {
138 my ($self) = @_; 191 my ($self) = @_;
139 192
140 return if $FOCUS == $self; 193 return if $FOCUS == $self;
194 return unless $self->{can_focus};
141 195
142 my $focus = $FOCUS; $FOCUS = $self; 196 my $focus = $FOCUS; $FOCUS = $self;
197
198 $self->emit (focus_in => $focus);
199
143 $focus->update if $focus; 200 $focus->update if $focus;
144 $FOCUS->update; 201 $FOCUS->update;
145} 202}
146 203
147sub focus_out { 204sub focus_out {
148 my ($self) = @_; 205 my ($self) = @_;
149 206
150 return unless $FOCUS == $self; 207 return unless $FOCUS == $self;
151 208
152 my $focus = $FOCUS; undef $FOCUS; 209 my $focus = $FOCUS; undef $FOCUS;
210
211 $self->emit (focus_out => $focus);
212
153 $focus->update if $focus; #? 213 $focus->update if $focus; #?
154} 214}
155 215
156sub mouse_motion { } 216sub mouse_motion { }
157sub button_up { } 217sub button_up { }
… …
178 glPushMatrix; 238 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 239 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 240 $self->_draw;
181 glPopMatrix; 241 glPopMatrix;
182 242
183 if ($self == $HOVER) { 243 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 244 my ($x, $y) = @$self{qw(x y)};
185 245
186 glColor 0, 0, 1, 0.2; 246 glColor 1, 0.8, 0.5, 0.2;
187 glEnable GL_BLEND; 247 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 248 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 249 glBegin GL_QUADS;
190 glVertex $x , $y; 250 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 251 glVertex $x + $self->{w}, $y;
… …
211 271
212 () 272 ()
213} 273}
214 274
215sub set_parent { 275sub set_parent {
216 my ($self, $par) = @_; 276 my ($self, $parent) = @_;
217 277
218 $self->{parent} = $par;
219 Scalar::Util::weaken $self->{parent}; 278 Scalar::Util::weaken ($self->{parent} = $parent);
220} 279}
221 280
222sub get_parent { 281sub check_size {
223 $_[0]->{parent} 282 my ($self) = @_;
283
284 my ($w, $h) = $self->size_request;
285
286 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w;
288 $self->{req_h} = $h;
289
290 $self->{parent}->check_size
291 if $self->{parent};
292 }
224} 293}
225 294
226sub update { 295sub update {
227 my ($self) = @_; 296 my ($self) = @_;
228 297
… …
231} 300}
232 301
233sub connect { 302sub connect {
234 my ($self, $signal, $cb) = @_; 303 my ($self, $signal, $cb) = @_;
235 304
236 push @{ $self->{cb}{$signal} }, $cb; 305 push @{ $self->{signal_cb}{$signal} }, $cb;
237} 306}
238 307
239sub emit { 308sub emit {
240 my ($self, $signal, @args) = @_; 309 my ($self, $signal, @args) = @_;
241 310
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
242 $_->($self, @args) 312 $cb->($self, @args);
243 for @{$self->{cb}{$signal} || []}; 313 }
244} 314}
245 315
246sub DESTROY { 316sub DESTROY {
247 my ($self) = @_; 317 my ($self) = @_;
248 318
… …
263 333
264 # range [value, low, high, page] 334 # range [value, low, high, page]
265 335
266 $class->SUPER::new ( 336 $class->SUPER::new (
267 bg => [0, 0, 0, 0.2], 337 bg => [0, 0, 0, 0.2],
268 active_bg => [1, 1, 1], 338 active_bg => [1, 1, 1, 0.5],
269 @_ 339 @_
270 ) 340 )
271} 341}
272 342
273sub _draw { 343sub _draw {
… …
317 387
318 $self 388 $self
319} 389}
320 390
321sub add { 391sub add {
322 my ($self, $chld) = @_; 392 my ($self, $child) = @_;
323 393
324 $chld->set_parent ($self); 394 $child->set_parent ($self);
395
396 use sort 'stable';
325 397
326 $self->{children} = [ 398 $self->{children} = [
327 sort { $a->{z} <=> $b->{z} } 399 sort { $a->{z} <=> $b->{z} }
328 @{$self->{children}}, $chld 400 @{$self->{children}}, $child
329 ]; 401 ];
330 402
331 $self->{w} = $self->{h} = -1; 403 $child->check_size;
332 $self->update;
333} 404}
334 405
335sub remove { 406sub remove {
336 my ($self, $widget) = @_; 407 my ($self, $child) = @_;
337 408
409 delete $child->{parent};
410
338 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
339 412
340 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 413 $self->check_size;
341} 414}
342 415
343sub find_widget { 416sub find_widget {
344 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
345 418
… …
375 448
376 $class->SUPER::new (children => [$child], %arg) 449 $class->SUPER::new (children => [$child], %arg)
377} 450}
378 451
379sub add { 452sub add {
380 my ($self, $widget) = @_; 453 my ($self, $child) = @_;
381 454
382 $self->{children} = []; 455 $self->{children} = [];
383 456
384 $self->SUPER::add ($widget); 457 $self->SUPER::add ($child);
385} 458}
386 459
387sub remove { 460sub remove {
388 my ($self, $widget) = @_; 461 my ($self, $widget) = @_;
389 462
… …
398sub size_request { 471sub size_request {
399 $_[0]{children}[0]->size_request 472 $_[0]{children}[0]->size_request
400} 473}
401 474
402sub size_allocate { 475sub size_allocate {
403 my ($self, $x, $y, $w, $h) = @_; 476 my ($self, $w, $h) = @_;
404 477
405 $self->_size_allocate ($x, $y, $w, $h) or return;
406
407 $self->{children}[0]->size_allocate (0, 0, $w, $h); 478 $self->{children}[0]->configure (0, 0, $w, $h);
408} 479}
409 480
410############################################################################# 481#############################################################################
411 482
412package CFClient::UI::Window; 483package CFClient::UI::Window;
… …
430} 501}
431 502
432sub render_chld { 503sub render_chld {
433 my ($self) = @_; 504 my ($self) = @_;
434 505
435 $self->{texture} = 506 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
436 CFClient::Texture->new_from_opengl ( 507 glClearColor 0, 0, 0, 1;
437 $self->{w}, $self->{h}, sub { $self->child->draw } 508 glClear GL_COLOR_BUFFER_BIT;
438 ); 509 $self->child->draw;
510 };
439} 511}
440 512
441sub size_allocate { 513sub size_allocate {
442 my ($self, $x, $y, $w, $h) = @_; 514 my ($self, $w, $h) = @_;
443 515
444 $self->_size_allocate ($x, $y, $w, $h) or return;
445
446 $self->child->size_allocate (0, 0, $w, $h); 516 $self->child->configure (0, 0, $w, $h);
447 517
448 $self->render_chld; 518 $self->render_chld;
449} 519}
450 520
451sub _draw { 521sub _draw {
… …
467 glDisable GL_TEXTURE_2D; 537 glDisable GL_TEXTURE_2D;
468} 538}
469 539
470############################################################################# 540#############################################################################
471 541
542package CFClient::UI::ViewPort;
543
544our @ISA = CFClient::UI::Window::;
545
546sub new { die }
547
548sub size_request {
549 my ($self) = @_;
550
551 @$self{qw(child_w child_h)} = $self->child->size_request;
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553
554 @$self{qw(child_w child_h)}
555}
556
557sub _draw {
558 my ($self) = @_;
559
560 $self->{children}[1]->draw;
561}
562
563
564#############################################################################
565
472package CFClient::UI::Frame; 566package CFClient::UI::Frame;
473 567
474our @ISA = CFClient::UI::Bin::; 568our @ISA = CFClient::UI::Bin::;
475 569
476use SDL::OpenGL; 570use SDL::OpenGL;
… …
486} 580}
487 581
488sub size_allocate { 582sub size_allocate {
489 my ($self, $x, $y, $w, $h) = @_; 583 my ($self, $x, $y, $w, $h) = @_;
490 584
491 $self->_size_allocate ($x, $y, $w, $h) or return;
492
493 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 585 $self->child->configure (2, 2, $w - 4, $h - 4);
494} 586}
495 587
496sub _draw { 588sub _draw {
497 my ($self) = @_; 589 my ($self) = @_;
498 590
… …
521 613
522my @tex = 614my @tex =
523 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
524 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 616 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
525 617
618sub new {
619 my $class = shift;
620
621 # TODO: user_x, user_y, overwrite moveto?
622
623 $class->SUPER::new (
624 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1],
626 border => 0.8,
627 @_
628 )
629}
630
631sub border {
632 int $_[0]{border} * $::FONTSIZE
633}
634
526sub size_request { 635sub size_request {
527 my ($self) = @_; 636 my ($self) = @_;
528 637
529 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530 639
531 my ($w, $h) = $self->SUPER::size_request; 640 my ($w, $h) = $self->SUPER::size_request;
532 641
533 $h += $tex[1]->{h}; 642 (
534 $h += $tex[4]->{h}; 643 $w + $self->border * 2,
535 $w += $tex[2]->{w}; 644 $h + $self->border * 2,
536 $w += $tex[3]->{w}; 645 )
537
538 ($w, $h)
539} 646}
540 647
541sub size_allocate { 648sub size_allocate {
542 my ($self, $x, $y, $w, $h) = @_; 649 my ($self, $w, $h) = @_;
543 650
544 $self->_size_allocate ($x, $y, $w, $h) or return; 651 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2;
545 653
546 $h -= $tex[1]{h}; 654 $self->child->configure ($self->border, $self->border, $w, $h);
547 $h -= $tex[4]{h};
548 $w -= $tex[2]{w};
549 $w -= $tex[3]{w};
550
551 $h = $h < 0 ? 0 : $h;
552 $w = $w < 0 ? 0 : $w;
553
554 my $child = $self->child;
555
556 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
557} 655}
558 656
559sub button_down { 657sub button_down {
560 my ($self, $ev, $x, $y) = @_; 658 my ($self, $ev, $x, $y) = @_;
561 659
660 my $border = $self->border;
661
562 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 662 if ($x < $self->{w} && $x >= $self->{w} - $border
563 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 663 && $y < $self->{h} && $y >= $self->{h} - $border) {
564 664
565 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 665 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566 my ($bw, $bh) = ($self->{w}, $self->{h}); 666 my ($bw, $bh) = ($self->{w}, $self->{h});
567 667
568 $self->{motion} = sub { 668 $self->{motion} = sub {
… …
570 670
571 ($x, $y) = ($ev->motion_x, $ev->motion_y); 671 ($x, $y) = ($ev->motion_x, $ev->motion_y);
572 672
573 $self->{user_w} = $bw + $x - $ox; 673 $self->{user_w} = $bw + $x - $ox;
574 $self->{user_h} = $bh + $y - $oy; 674 $self->{user_h} = $bh + $y - $oy;
575 $self->update; 675 $self->check_size;
576 }; 676 };
577 677
578 } elsif ($x >= 0 && $x < $self->{w} 678 } elsif ($x >= 0 && $x < $self->{w}
579 && $y >= 0 && $y < $tex[1]{h}) { 679 && $y >= 0 && $y < $border) {
580 680
581 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 681 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582 my ($bx, $by) = ($self->{x}, $self->{y}); 682 my ($bx, $by) = ($self->{x}, $self->{y});
583 683
584 $self->{motion} = sub { 684 $self->{motion} = sub {
… …
605} 705}
606 706
607sub _draw { 707sub _draw {
608 my ($self) = @_; 708 my ($self) = @_;
609 709
610 my ($w, $h) = ($self->{w}, $self->{h}); 710 my ($w, $h ) = ($self->{w}, $self->{h});
611 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 711 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
612 712
613 glEnable GL_BLEND; 713 glEnable GL_BLEND;
614 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
615 glEnable GL_TEXTURE_2D; 715 glEnable GL_TEXTURE_2D;
616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
617 717
618 my $top = $tex[1]; 718 my $border = $self->border;
719
720 glColor @{ $self->{border_bg} };
619 $top->draw_quad (0, 0, $w, $top->{h}); 721 $tex[1]->draw_quad (0, 0, $w, $border);
620 722 $tex[3]->draw_quad (0, $border, $border, $ch);
621 my $left = $tex[3]; 723 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
622 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 724 $tex[4]->draw_quad (0, $h - $border, $w, $border);
623
624 my $right = $tex[2];
625 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
626
627 my $bottom = $tex[4];
628 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
629 725
630 my $bg = $tex[0]; 726 my $bg = $tex[0];
631 727
632 glBindTexture GL_TEXTURE_2D, $bg->{name}; 728 # TODO: repeat texture not scale
633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
635 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
636
637 my $rep_x = $cw / $bg->{w}; 729 my $rep_x = $cw / $bg->{w};
638 my $rep_y = $ch / $bg->{h}; 730 my $rep_y = $ch / $bg->{h};
639 731
640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 732 glColor @{ $self->{bg} };
733
734 $bg->{s} = $rep_x;
735 $bg->{t} = $rep_y;
736 $bg->{wrap_mode} = 1;
737 $bg->draw_quad ($border, $border, $cw, $ch);
641 738
642 glDisable GL_TEXTURE_2D; 739 glDisable GL_TEXTURE_2D;
643 glDisable GL_BLEND; 740 glDisable GL_BLEND;
644 741
645 $self->child->draw; 742 $self->child->draw;
646
647} 743}
648 744
649############################################################################# 745#############################################################################
650 746
651package CFClient::UI::Table; 747package CFClient::UI::Table;
… …
664 @_ 760 @_
665 ) 761 )
666} 762}
667 763
668sub add { 764sub add {
669 my ($self, $x, $y, $chld) = @_; 765 my ($self, $x, $y, $child) = @_;
670 766
767 $child->set_parent ($self);
671 $self->{children}[$y][$x] = $chld; 768 $self->{children}[$y][$x] = $child;
672 $chld->set_parent ($self);
673 769
674 $self->{w} = $self->{h} = -1; 770 $child->check_size;
771}
772
773# TODO: move to container class maybe? send childs a signal on removal?
774sub clear {
775 my ($self) = @_;
776
777 delete $self->{children};
675 $self->update; 778 $self->update;
676} 779}
677 780
678sub get_wh { 781sub get_wh {
679 my ($self) = @_; 782 my ($self) = @_;
… …
707 (sum @$hs), 810 (sum @$hs),
708 ) 811 )
709} 812}
710 813
711sub size_allocate { 814sub size_allocate {
712 my ($self, $x, $y, $w, $h) = @_; 815 my ($self, $w, $h) = @_;
713
714 $self->_size_allocate ($x, $y, $w, $h) or return;
715 816
716 my ($ws, $hs) = $self->get_wh; 817 my ($ws, $hs) = $self->get_wh;
717 818
718 my $req_w = sum @$ws; 819 my $req_w = sum @$ws;
719 my $req_h = sum @$hs; 820 my $req_h = sum @$hs;
… …
725 826
726 # linearly scale sizes 827 # linearly scale sizes
727 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 828 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 829 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729 830
831 CFClient::UI::harmonize $ws;
832 CFClient::UI::harmonize $hs;
833
730 my $y; 834 my $y;
731 835
732 for my $r (0 .. $#{$self->{children}}) { 836 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 837 my $row = $self->{children}[$r]
734 or next; 838 or next;
735 839
736 my $x = 0; 840 my $x = 0;
737 my $row_h = $hs->[$r]; 841 my $row_h = $hs->[$r];
738 842
739 for my $c (0 .. $#$row) { 843 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 844 my $col_w = $ws->[$c];
744 845
846 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 847 $widget->configure ($x, $y, $col_w, $row_h);
848 }
746 849
747 $x += $col_w; 850 $x += $col_w;
748 } 851 }
749 852
750 $y += $row_h; 853 $y += $row_h;
… …
794 (List::Util::max map $_->[1], @alloc), 897 (List::Util::max map $_->[1], @alloc),
795 ) 898 )
796} 899}
797 900
798sub size_allocate { 901sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
800
801 $self->_size_allocate ($x, $y, $w, $h) or return;
802
803 return unless $self->{w};
804 903
805 ($h, $w) = ($w, $h); 904 ($h, $w) = ($w, $h);
806 905
807 my $children = $self->{children}; 906 my $children = $self->{children};
808 907
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 923 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 924 $h[$_] = $alloc_h;
826 } 925 }
827 } 926 }
828 927
928 CFClient::UI::harmonize \@h;
929
829 my $y = 0; 930 my $y = 0;
830 for (0 .. $#$children) { 931 for (0 .. $#$children) {
831 my $child = $children->[$_]; 932 my $child = $children->[$_];
832 my $h = $h[$_]; 933 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 934 $child->configure ($y, 0, $h, $w);
834 935
835 $y += $h; 936 $y += $h;
836 } 937 }
938
939 1
837} 940}
838 941
839############################################################################# 942#############################################################################
840 943
841package CFClient::UI::VBox; 944package CFClient::UI::VBox;
… …
854 (List::Util::sum map $_->[1], @alloc), 957 (List::Util::sum map $_->[1], @alloc),
855 ) 958 )
856} 959}
857 960
858sub size_allocate { 961sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
860
861 $self->_size_allocate ($x, $y, $w, $h) or return;
862
863 return unless $self->{h};
864 963
865 my $children = $self->{children}; 964 my $children = $self->{children};
866 965
867 my @h = map +($_->size_request)[1], @$children; 966 my @h = map +($_->size_request)[1], @$children;
868 967
… …
880 979
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 980 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882 } 981 }
883 } 982 }
884 983
984 CFClient::UI::harmonize \@h;
985
885 my $y = 0; 986 my $y = 0;
886 for (0 .. $#$children) { 987 for (0 .. $#$children) {
887 my $child = $children->[$_]; 988 my $child = $children->[$_];
888 my $h = $h[$_]; 989 my $h = $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 990 $child->configure (0, $y, $w, $h);
890 991
891 $y += $h; 992 $y += $h;
892 } 993 }
994
995 1
893} 996}
894 997
895############################################################################# 998#############################################################################
896 999
897package CFClient::UI::Label; 1000package CFClient::UI::Label;
… …
902 1005
903sub new { 1006sub new {
904 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
905 1008
906 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 1010 fg => [1, 1, 1],
908 height => $::FONTSIZE, 1011 fontsize => 1,
909 text => "", 1012 text => "",
910 align => -1, 1013 align => -1,
1014 valign => -1,
911 padding => 2, 1015 padding => 2,
912 layout => new CFClient::Layout, 1016 layout => new CFClient::Layout,
913 %arg 1017 %arg
914 ); 1018 );
915 1019
916 $self->set_text ($self->{text}); 1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1021
1022 $self->set_text (delete $self->{text}) if exists $self->{text};
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
917 1024
918 $self 1025 $self
919} 1026}
920 1027
921sub escape_text { 1028sub escape_text {
… …
929} 1036}
930 1037
931sub set_text { 1038sub set_text {
932 my ($self, $text) = @_; 1039 my ($self, $text) = @_;
933 1040
934 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 1041 $self->{layout}->set_text ($text);
936 1042
937 delete $self->{texture}; 1043 delete $self->{texture};
938 $self->update; 1044 $self->update;
939} 1045}
940 1046
941sub get_text { 1047sub set_markup {
942 my ($self, $text) = @_; 1048 my ($self, $markup) = @_;
943 1049
944 $self->{text} 1050 $self->{layout}->set_markup ($markup);
1051
1052 delete $self->{texture};
1053 $self->update;
945} 1054}
946 1055
947sub size_request { 1056sub size_request {
948 my ($self) = @_; 1057 my ($self) = @_;
949 1058
950 $self->{layout}->set_width; 1059 $self->{layout}->set_width;
951 $self->{layout}->set_height ($self->{height}); 1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061
952 my ($w, $h) = $self->{layout}->size; 1062 my ($w, $h) = $self->{layout}->size;
953 1063
954 ( 1064 (
955 $w + $self->{padding} * 2, 1065 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 1066 $h + $self->{padding} * 2,
957 ) 1067 )
958} 1068}
959 1069
960sub size_allocate { 1070sub size_allocate {
961 my ($self, $x, $y, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
962
963 $self->_size_allocate ($x, $y, $w, $h) or return;
964 1072
965 delete $self->{texture}; 1073 delete $self->{texture};
966}
967
968sub update {
969 my ($self) = @_;
970
971 delete $self->{texture};
972 $self->SUPER::update;
973} 1074}
974 1075
975sub _draw { 1076sub _draw {
976 my ($self) = @_; 1077 my ($self) = @_;
977 1078
978 my $tex = $self->{texture} ||= do { 1079 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 1080 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
981 new_from_layout CFClient::Texture $self->{layout} 1082 new_from_layout CFClient::Texture $self->{layout}
982 }; 1083 };
983 1084
984 glEnable GL_BLEND; 1085 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
986 glEnable GL_TEXTURE_2D; 1087 glEnable GL_TEXTURE_2D;
987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
988 1089
989 glColor @{$self->{fg}}; 1090 glColor @{$self->{fg}};
990 1091
991 my $x = 1092 $self->{ox} = int (
992 $self->{align} < 0 ? $self->{padding} 1093 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1094 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5; 1095 : ($self->{w} - $tex->{w}) * 0.5
1096 );
995 1097
996 $tex->draw_quad ($x, $self->{padding}); 1098 $self->{oy} = int (
1099 $self->{valign} < 0 ? $self->{padding}
1100 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1101 : ($self->{h} - $tex->{h}) * 0.5
1102 );
1103
1104 $tex->draw_quad ($self->{ox}, $self->{oy});
997 1105
998 glDisable GL_TEXTURE_2D; 1106 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1107 glDisable GL_BLEND;
1000} 1108}
1001 1109
1002############################################################################# 1110#############################################################################
1003 1111
1004package CFClient::UI::Entry; 1112package CFClient::UI::EntryBase;
1005 1113
1006our @ISA = CFClient::UI::Label::; 1114our @ISA = CFClient::UI::Label::;
1007 1115
1008use SDL;
1009use SDL::OpenGL; 1116use SDL::OpenGL;
1010 1117
1011sub new { 1118sub new {
1012 my $class = shift; 1119 my $class = shift;
1013 1120
1014 $class->SUPER::new ( 1121 $class->SUPER::new (
1015 fg => [1, 1, 1], 1122 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2], 1123 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1], 1124 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1125 active_fg => [0, 0, 0],
1126 can_hover => 1,
1127 can_focus => 1,
1128 valign => 0,
1019 @_ 1129 @_
1020 ) 1130 )
1021} 1131}
1022 1132
1023sub _set_text { 1133sub _set_text {
1024 my ($self, $text) = @_; 1134 my ($self, $text) = @_;
1025 1135
1136 delete $self->{cur_h};
1137
1138 return if $self->{text} eq $text;
1139
1140 delete $self->{texture};
1141
1026 $self->{last_activity} = $::NOW; 1142 $self->{last_activity} = $::NOW;
1027
1028 $self->{text} = $text; 1143 $self->{text} = $text;
1029 $self->{layout}->set_width ($self->{w});
1030 1144
1031 $text =~ s/./*/g if $self->{hidden}; 1145 $text =~ s/./*/g if $self->{hidden};
1146 $self->{layout}->set_text ("$text ");
1032 1147
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1148 $self->emit (changed => $self->{text});
1149}
1034 1150
1035 $text = substr $text, 0, $self->{cursor}; 1151sub get_text {
1036 utf8::encode $text; 1152 $_[0]{text}
1037
1038 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1039} 1153}
1040 1154
1041sub size_request { 1155sub size_request {
1042 my ($self) = @_; 1156 my ($self) = @_;
1043 1157
… …
1045 1159
1046 ($w + 1, $h) # add 1 for cursor 1160 ($w + 1, $h) # add 1 for cursor
1047} 1161}
1048 1162
1049sub size_allocate { 1163sub size_allocate {
1050 my ($self, $x, $y, $w, $h) = @_; 1164 my ($self, $w, $h) = @_;
1051
1052 $self->SUPER::size_allocate ($x, $y, $w, $h);
1053 1165
1054 $self->_set_text ($self->{text}); 1166 $self->_set_text ($self->{text});
1055} 1167}
1056 1168
1057sub set_text { 1169sub set_text {
… …
1070 1182
1071 my $uni = $ev->key_unicode; 1183 my $uni = $ev->key_unicode;
1072 1184
1073 my $text = $self->get_text; 1185 my $text = $self->get_text;
1074 1186
1075 if ($sym == SDLK_BACKSPACE) { 1187 if ($sym == 8) {
1076 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1188 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1077 } elsif ($sym == SDLK_DELETE) { 1189 } elsif ($sym == 127) {
1078 substr $text, $self->{cursor}, 1, ""; 1190 substr $text, $self->{cursor}, 1, "";
1079 } elsif ($sym == SDLK_LEFT) { 1191 } elsif ($sym == CFClient::SDLK_LEFT) {
1080 --$self->{cursor} if $self->{cursor}; 1192 --$self->{cursor} if $self->{cursor};
1081 } elsif ($sym == SDLK_RIGHT) { 1193 } elsif ($sym == CFClient::SDLK_RIGHT) {
1082 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1194 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1083 } elsif ($sym == SDLK_HOME) { 1195 } elsif ($sym == CFClient::SDLK_HOME) {
1084 $self->{cursor} = 0; 1196 $self->{cursor} = 0;
1085 } elsif ($sym == SDLK_END) { 1197 } elsif ($sym == CFClient::SDLK_END) {
1086 $self->{cursor} = length $text; 1198 $self->{cursor} = length $text;
1199 } elsif ($sym == 27) {
1200 $self->emit ('escape');
1087 } elsif ($uni) { 1201 } elsif ($uni) {
1088 substr $text, $self->{cursor}++, 0, chr $uni; 1202 substr $text, $self->{cursor}++, 0, chr $uni;
1089 } 1203 }
1090 1204
1091 $self->_set_text ($text); 1205 $self->_set_text ($text);
… …
1145 1259
1146 $self->SUPER::_draw; 1260 $self->SUPER::_draw;
1147 1261
1148 #TODO: force update every cursor change :( 1262 #TODO: force update every cursor change :(
1149 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1263 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1264
1265 unless (exists $self->{cur_h}) {
1266 my $text = substr $self->{text}, 0, $self->{cursor};
1267 utf8::encode $text;
1268
1269 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1270 }
1271
1150 glColor @{$self->{fg}}; 1272 glColor @{$self->{fg}};
1151 glBegin GL_LINES; 1273 glBegin GL_LINES;
1152 glVertex $self->{cur_x}, $self->{cur_y};
1153 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1274 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1275 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1154 glEnd; 1276 glEnd;
1155 } 1277 }
1156} 1278}
1157 1279
1158#############################################################################
1159
1160package CFClient::UI::Slider; 1280package CFClient::UI::Entry;
1161 1281
1162use strict; 1282our @ISA = CFClient::UI::EntryBase::;
1163 1283
1164use SDL::OpenGL; 1284use SDL::OpenGL;
1165 1285
1286sub key_down {
1287 my ($self, $ev) = @_;
1288
1289 my $sym = $ev->key_sym;
1290
1291 if ($sym == 13) {
1292 $self->emit (activate => $self->get_text);
1293 $self->update;
1294
1295 } else {
1296 $self->SUPER::key_down ($ev);
1297 }
1298
1299}
1300
1301#############################################################################
1302
1303package CFClient::UI::Button;
1304
1166our @ISA = CFClient::UI::DrawBG::; 1305our @ISA = CFClient::UI::Label::;
1306
1307use SDL::OpenGL;
1308
1309my @tex =
1310 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1311 qw(b1_button_active.png);
1167 1312
1168sub new { 1313sub new {
1169 my $class = shift; 1314 my $class = shift;
1170 1315
1316 $class->SUPER::new (
1317 padding => 4,
1318 fg => [1, 1, 1],
1319 bg => [1, 1, 1, 0.2],
1320 active_fg => [0, 0, 1],
1321 can_hover => 1,
1322 align => 0,
1323 valign => 0,
1324 @_
1325 )
1326}
1327
1328sub button_up {
1329 my ($self, $ev, $x, $y) = @_;
1330
1331 if ($x >= 0 && $x < $self->{w}
1332 && $y >= 0 && $y < $self->{h}) {
1333 $self->emit ("activate");
1334 }
1335}
1336
1337sub _draw {
1338 my ($self) = @_;
1339
1340 local $self->{fg} = $self->{fg};
1341
1342 if ($GRAB == $self) {
1343 $self->{fg} = $self->{active_fg};
1344 }
1345
1346 glEnable GL_BLEND;
1347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1348 glEnable GL_TEXTURE_2D;
1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1350 glColor 0, 0, 0, 1;
1351
1352 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1353
1354 glDisable GL_TEXTURE_2D;
1355 glDisable GL_BLEND;
1356
1357 $self->SUPER::_draw;
1358}
1359
1360#############################################################################
1361
1362package CFClient::UI::CheckBox;
1363
1364our @ISA = CFClient::UI::DrawBG::;
1365
1366my @tex =
1367 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1368 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1369
1370use SDL::OpenGL;
1371
1372sub new {
1373 my $class = shift;
1374
1375 $class->SUPER::new (
1376 padding => 2,
1377 fg => [1, 1, 1],
1378 active_fg => [1, 1, 0],
1379 state => 0,
1380 can_hover => 1,
1381 @_
1382 )
1383}
1384
1385sub size_request {
1386 my ($self) = @_;
1387
1388 ($self->{padding} * 2 + 6) x 2
1389}
1390
1391sub button_down {
1392 my ($self, $ev, $x, $y) = @_;
1393
1394 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1395 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1396 $self->{state} = !$self->{state};
1397 $self->emit (changed => $self->{state});
1398 }
1399}
1400
1401sub _draw {
1402 my ($self) = @_;
1403
1404 $self->SUPER::_draw;
1405
1406 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1407
1408 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1409
1410 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1411
1412 glEnable GL_BLEND;
1413 glEnable GL_TEXTURE_2D;
1414 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1415
1416 my $tex = $self->{state} ? $tex[1] : $tex[0];
1417
1418 $tex->draw_quad (0, 0, $s, $s);
1419
1420 glDisable GL_TEXTURE_2D;
1421 glDisable GL_BLEND;
1422}
1423
1424#############################################################################
1425
1426package CFClient::UI::VGauge;
1427
1428our @ISA = CFClient::UI::Base::;
1429
1430use SDL::OpenGL;
1431
1432my %tex = (
1433 food => [
1434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1435 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1436 ],
1437 grace => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1440 ],
1441 hp => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1444 ],
1445 mana => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1448 ],
1449);
1450
1451# eg. VGauge->new (gauge => 'food'), default gauge: food
1452sub new {
1453 my $class = shift;
1454
1455 my $self = $class->SUPER::new (gauge => 'food', @_);
1456
1457 $self
1458}
1459
1460sub size_request {
1461 my ($self) = @_;
1462
1463 my $tex = $tex{$self->{gauge}}[0];
1464
1465 @$tex{qw(w h)}
1466}
1467
1468sub set_max {
1469 my ($self, $max) = @_;
1470
1471 $self->{max_val} = $max;
1472}
1473
1474sub set_value {
1475 my ($self, $val, $max) = @_;
1476
1477 $self->set_max ($max)
1478 if defined $max;
1479
1480 $max = $self->{max_val};
1481 $self->{val} = $val;
1482
1483 $self->update;
1484}
1485
1486sub _draw {
1487 my ($self) = @_;
1488
1489 my $tex = $tex{$self->{gauge}};
1490
1491 my ($w, $h) = ($self->{w}, $self->{h});
1492
1493 my $ycut = $self->{val} / ($self->{max_val} || 1);
1494 $ycut = 1 if $self->{val} > $self->{max_val};
1495
1496 my $t1 = $tex->[0];
1497 my $t2 = $tex->[1];
1498
1499 glEnable GL_BLEND;
1500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1501 glEnable GL_TEXTURE_2D;
1502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1503
1504 my $h1 = $self->{h} - $ycut * $self->{h};
1505 my $h2 = $ycut * $self->{h};
1506
1507 my $yp = 0;
1508
1509 glBindTexture GL_TEXTURE_2D, $t1->{name};
1510 glBegin GL_QUADS;
1511 glTexCoord 0 , 0; glVertex 0 , $yp;
1512 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1513 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1514 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1515 glEnd;
1516
1517 $yp += $h1;
1518
1519 glBindTexture GL_TEXTURE_2D, $t2->{name};
1520 glBegin GL_QUADS;
1521 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1522 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1523 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1524 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1525 glEnd;
1526
1527 glDisable GL_BLEND;
1528 glDisable GL_TEXTURE_2D;
1529}
1530
1531#############################################################################
1532
1533package CFClient::UI::Slider;
1534
1535use strict;
1536
1537use SDL::OpenGL;
1538
1539our @ISA = CFClient::UI::DrawBG::;
1540
1541my @tex =
1542 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1543 qw(s1_slider.png s1_slider_bg.png);
1544
1545sub new {
1546 my $class = shift;
1547
1171 # range [value, low, high, page] 1548 # range [value, low, high, page]
1172 1549
1550 # TODO: 0-width page
1551 # TODO: req_w/h are wrong with vertical
1552 # TODO: calculations are off
1173 my $self = $class->SUPER::new ( 1553 my $self = $class->SUPER::new (
1174 fg => [1, 1, 1], 1554 fg => [1, 1, 1],
1175 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1176 range => [0, 0, 100, 10], 1556 range => [0, 0, 100, 10],
1177 req_w => 40, 1557 req_w => 20,
1178 req_h => 10, 1558 req_h => 20,
1179 vertical => 0, 1559 vertical => 0,
1560 can_hover => 1,
1561 inner_pad => 5,
1180 @_ 1562 @_
1181 ); 1563 );
1182 1564
1183 $self 1565 $self
1184} 1566}
… …
1205 if ($GRAB == $self) { 1587 if ($GRAB == $self) {
1206 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1588 my ($value, $lo, $hi, $page) = @{$self->{range}};
1207 1589
1208 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1590 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1209 1591
1592 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1593 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1594
1595 $x -= $inner_pad_px; # substract the padding
1210 $x = $x * ($hi - $lo) / $w + $lo; 1596 $x = $x * ($hi - $lo) / $inner_w + $lo;
1211 $x = $lo if $x < $lo; 1597 $x = $lo if $x < $lo;
1212 $x = $hi - $page if $x > $hi - $page; 1598 $x = $hi - $page if $x > $hi - $page;
1213 $self->{range}[0] = $x; 1599 $self->{range}[0] = $x;
1214 1600
1215 $self->emit (changed => $x); 1601 $self->emit (changed => $x);
1216 $self->update; 1602 $self->update;
1217 } 1603 }
1604}
1605
1606# the inner_* stuff is for generating a padding for the slider handle,
1607# so that the handle doesn't leave the texture. This calculation isn't 100%
1608# correct propably, but it does the job for now
1609sub _calc_inner_pad_px {
1610 my ($self, $w) = @_;
1611 ($w / 100) * $self->{inner_pad} # % to pixels
1218} 1612}
1219 1613
1220sub _draw { 1614sub _draw {
1221 my ($self) = @_; 1615 my ($self) = @_;
1222 1616
… …
1236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1630 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1631 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1238 1632
1239 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1633 my ($value, $lo, $hi, $page) = @{$self->{range}};
1240 1634
1635 $hi = $value + 1 if $lo == $hi;
1636
1637 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1638 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1639
1241 $page = int $page * $w / ($hi - $lo); 1640 $page = int $page * $inner_w / ($hi - $lo);
1242 $value = int +($value - $lo) * $w / ($hi - $lo); 1641 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1243 1642
1244 $w -= $page; 1643 $w -= $page;
1245 $page &= ~1; 1644 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0; 1645 glTranslate $page * 0.5, 0, 0;
1646 $page ||= 2;
1247 1647
1248 glColor @$fg;
1249 glBegin GL_LINES;
1250 glVertex 0, 0; glVertex 0, $h;
1251 glVertex $w - 1, 0; glVertex $w - 1, $h;
1252 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1253 glEnd;
1254
1255 my $knob_a = $value - $page * 0.5; 1648 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1256 my $knob_b = $value + $page * 0.5; 1649 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1257 1650
1258 glBegin GL_QUADS; 1651 glEnable GL_BLEND;
1259 glColor @$fg; 1652 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1260 glVertex $knob_a, 0; 1653 glEnable GL_TEXTURE_2D;
1261 glVertex $knob_a, $h; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1262 glVertex $knob_b, $h;
1263 glVertex $knob_b, 0;
1264 1655
1265 if ($knob_a < $knob_b - 2) { 1656 # draw background
1266 glColor @$bg; 1657 $tex[1]->draw_quad (0, 0, $w, $h);
1267 glVertex $knob_a + 1, 1;
1268 glVertex $knob_a + 1, $h - 1;
1269 glVertex $knob_b - 1, $h - 1;
1270 glVertex $knob_b - 1, 1;
1271 }
1272 glEnd;
1273}
1274 1658
1275############################################################################# 1659 # draw handle
1660 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1276 1661
1662 glDisable GL_BLEND;
1663 glDisable GL_TEXTURE_2D;
1664}
1665
1666#############################################################################
1667
1277package CFClient::UI::MapWidget; 1668package CFClient::UI::TextView;
1278 1669
1279use strict; 1670our @ISA = CFClient::UI::HBox::;
1280 1671
1281use List::Util qw(min max);
1282
1283use SDL;
1284use SDL::OpenGL; 1672use SDL::OpenGL;
1285
1286our @ISA = CFClient::UI::Base::;
1287 1673
1288sub new { 1674sub new {
1289 my $class = shift; 1675 my $class = shift;
1290 1676
1291 $class->SUPER::new ( 1677 my $self = $class->SUPER::new (
1292 z => -1, 1678 fontsize => 1,
1293 list => (glGenLists 1),
1294 @_ 1679 @_,
1680
1681 layout => (new CFClient::Layout),
1682 par => [],
1683 height => 0,
1684 children => [
1685 (new CFClient::UI::Empty expand => 1),
1686 (new CFClient::UI::Slider vertical => 1),
1687 ],
1295 ) 1688 );
1296}
1297 1689
1298sub key_down { 1690 $self->{children}[1]->connect (changed => sub {
1299 print "MAPKEYDOWN\n"; 1691 $self->update;
1300} 1692 });
1301 1693
1302sub key_up { 1694 $self
1303} 1695}
1304 1696
1305sub size_request { 1697sub set_fontsize {
1698 my ($self, $fontsize) = @_;
1699
1700 $self->{fontsize} = $fontsize;
1701 $self->reflow;
1702}
1703
1704sub text_height {
1705 my ($self, $text) = @_;
1706
1707 my $layout = $self->{layout};
1708
1709 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1710 $layout->set_width ($self->{w});
1711 $layout->set_text ($text);
1306 ( 1712
1307 1 + 32 * int $::WIDTH / 32, 1713 ($layout->size)[1]
1308 1 + 32 * int $::HEIGHT / 32, 1714}
1309 ) 1715
1716sub reflow {
1717 my ($self) = @_;
1718
1719 $self->{need_reflow}++;
1720 $self->update;
1721}
1722
1723sub size_allocate {
1724 my ($self, $w, $h) = @_;
1725
1726 $self->SUPER::size_allocate ($w, $h);
1727
1728 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1729 $self->{layout}->set_width ($self->{children}[0]{w});
1730
1731 $self->reflow;
1732}
1733
1734sub add_paragraph {
1735 my ($self, $color, $text) = @_;
1736
1737 #TODO: intelligently "reformat" paragraph
1738
1739 my $height = $self->text_height ($text);
1740
1741 $self->{height} += $height;
1742
1743 push @{$self->{par}}, [$height, $color, $text];
1744
1745 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1746 $self->{children}[1]->update;
1310} 1747}
1311 1748
1312sub update { 1749sub update {
1313 my ($self) = @_; 1750 my ($self) = @_;
1314 1751
1315 $self->{need_update} = 1;
1316 $self->SUPER::update; 1752 $self->SUPER::update;
1317}
1318 1753
1319sub draw { 1754 return unless $self->{h} > 0;
1320 my ($self) = @_;
1321 1755
1756 delete $self->{texture};
1757
1758 $ROOT->on_refresh ($self, sub {
1322 if (delete $self->{need_update}) { 1759 if (delete $self->{need_reflow}) {
1323 glNewList $self->{list}, GL_COMPILE; 1760 my $height = 0;
1324 1761
1325 my $mx = $::CONN->{mapx}; 1762 $height += $_->[0] = $self->text_height ($_->[2])
1326 my $my = $::CONN->{mapy}; 1763 for @{$self->{par}};
1327 1764
1328 my $map = $::CONN->{map}; 1765 $self->{height} = $height;
1329 1766
1330 my ($xofs, $yofs); 1767 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1331 1768
1332 my $sw = 1 + int $::WIDTH / 32; 1769 delete $self->{texture};
1333 my $sh = 1 + int $::HEIGHT / 32;
1334
1335 if ($::CONN->{mapw} > $sw) {
1336 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1337 } else {
1338 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1339 } 1770 }
1340 1771
1341 if ($::CONN->{maph} > $sh) { 1772 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1342 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1773 glClearColor 0, 0, 0, 1;
1343 } else { 1774 glClear GL_COLOR_BUFFER_BIT;
1344 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1775
1776 glEnable GL_BLEND;
1777 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1778 glEnable GL_TEXTURE_2D;
1779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1780
1781 my $top = int $self->{children}[1]{range}[0];
1782
1783 my $y0 = $top;
1784 my $y1 = $top + $self->{h};
1785
1786 my $y = 0;
1787
1788 my $layout = $self->{layout};
1789
1790 for my $par (@{$self->{par}}) {
1791 my $h = $par->[0];
1792
1793 if ($y0 < $y + $h && $y < $y1) {
1794 $layout->set_text ($par->[2]);
1795
1796 glColor @{ $par->[1] };
1797 my ($W, $H) = $layout->size;
1798 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1799 }
1800
1801 $y += $h;
1802 }
1803
1804 glDisable GL_TEXTURE_2D;
1805 glDisable GL_BLEND;
1345 } 1806 };
1807 });
1808}
1346 1809
1810sub _draw {
1811 my ($self) = @_;
1812
1813 if ($self->{texture}) {
1347 glEnable GL_TEXTURE_2D; 1814 glEnable GL_TEXTURE_2D;
1348 glEnable GL_BLEND;
1349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1351 1816 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1352 my $sw4 = ($sw + 3) & ~3;
1353 my $darkness = "\x00" x ($sw4 * $sh);
1354
1355 for my $x (0 .. $sw - 1) {
1356 my $row = $map->[$x + $xofs];
1357 for my $y (0 .. $sh - 1) {
1358
1359 my $cell = $row->[$y + $yofs]
1360 or next;
1361
1362 my $dark = $cell->[0];
1363 if ($dark < 0) {
1364 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1365 } else {
1366 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1367 }
1368
1369 for my $num (grep $_, @$cell[1,2,3]) {
1370 my $tex = $::CONN->{face}[$num]{texture} || next;
1371
1372 my ($w, $h) = @$tex{qw(w h)};
1373
1374 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1375 }
1376 }
1377 }
1378
1379# if (1) { # higher quality darkness
1380# $lighting =~ s/(.)/$1$1$1/gs;
1381# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1382#
1383# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1384#
1385# $lighting = $pb->get_pixels;
1386# $lighting =~ s/(.)../$1/gs;
1387# }
1388
1389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1390
1391 $darkness = new CFClient::Texture
1392 w => $sw4,
1393 h => $sh,
1394 data => $darkness,
1395 internalformat => GL_ALPHA,
1396 format => GL_ALPHA;
1397
1398 glColor 0.45, 0.45, 0.45, 1;
1399 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1400
1401 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403
1404 glEndList;
1405 } 1818 }
1406 1819
1407 glCallList $self->{list}; 1820 $self->{children}[1]->draw;
1408}
1409 1821
1410my %DIR = (
1411 SDLK_KP8, [1, "north"],
1412 SDLK_KP9, [2, "northeast"],
1413 SDLK_KP6, [3, "east"],
1414 SDLK_KP3, [4, "southeast"],
1415 SDLK_KP2, [5, "south"],
1416 SDLK_KP1, [6, "southwest"],
1417 SDLK_KP4, [7, "west"],
1418 SDLK_KP7, [8, "northwest"],
1419
1420 SDLK_UP, [1, "north"],
1421 SDLK_RIGHT, [3, "east"],
1422 SDLK_DOWN, [5, "south"],
1423 SDLK_LEFT, [7, "west"],
1424);
1425
1426sub key_down {
1427 my ($self, $ev) = @_;
1428
1429 my $mod = $ev->key_mod;
1430 my $sym = $ev->key_sym;
1431
1432 if ($sym == SDLK_KP5) {
1433 $::CONN->send ("command stay fire");
1434 } elsif (exists $DIR{$sym}) {
1435 if ($mod & KMOD_SHIFT) {
1436 $self->{shft}++;
1437 $::CONN->send ("command fire $DIR{$sym}[0]");
1438 } elsif ($mod & KMOD_CTRL) {
1439 $self->{ctrl}++;
1440 $::CONN->send ("command run $DIR{$sym}[0]");
1441 } else {
1442 $::CONN->send ("command $DIR{$sym}[1]");
1443 }
1444 }
1445}
1446
1447sub key_up {
1448 my ($self, $ev) = @_;
1449
1450 my $mod = $ev->key_mod;
1451 my $sym = $ev->key_sym;
1452
1453 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454 $::CONN->send ("command fire_stop");
1455 }
1456 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457 $::CONN->send ("command run_stop");
1458 }
1459} 1822}
1460 1823
1461############################################################################# 1824#############################################################################
1462 1825
1463package CFClient::UI::Animator; 1826package CFClient::UI::Animator;
… …
1500 glPopMatrix; 1863 glPopMatrix;
1501} 1864}
1502 1865
1503############################################################################# 1866#############################################################################
1504 1867
1505package CFClient::UI::Toplevel; 1868package CFClient::UI::Flopper;
1869
1870our @ISA = CFClient::UI::Button::;
1871
1872sub new {
1873 my $class = shift;
1874
1875 my $self = $class->SUPER::new (
1876 state => 0,
1877 connect_activate => \&toggle_flopper,
1878 @_
1879 );
1880
1881 if ($self->{state}) {
1882 $self->{state} = 0;
1883 $self->toggle_flopper;
1884 }
1885
1886 $self
1887}
1888
1889sub toggle_flopper {
1890 my ($self) = @_;
1891
1892 # TODO: use animation
1893 if ($self->{state} = !$self->{state}) {
1894 $CFClient::UI::ROOT->add ($self->{other});
1895 $self->{other}->move ($self->coord2global (0, $self->{h}));
1896 $self->emit ("open");
1897 } else {
1898 $CFClient::UI::ROOT->remove ($self->{other});
1899 $self->emit ("close");
1900 }
1901
1902 $self->emit (changed => $self->{state});
1903}
1904
1905#############################################################################
1906
1907package CFClient::UI::Root;
1506 1908
1507our @ISA = CFClient::UI::Container::; 1909our @ISA = CFClient::UI::Container::;
1910
1911use SDL::OpenGL;
1912
1913sub check_size {
1914 my ($self) = @_;
1915
1916 $self->configure (0, 0, $::WITH, $::HEIGHT);
1917}
1508 1918
1509sub size_request { 1919sub size_request {
1510 ($::WIDTH, $::HEIGHT) 1920 ($::WIDTH, $::HEIGHT)
1511} 1921}
1512 1922
1513sub size_allocate { 1923sub configure {
1514 my ($self, $x, $y, $w, $h) = @_; 1924 my ($self, $x, $y, $w, $h) = @_;
1515 1925
1516 $self->_size_allocate ($x, $y, $w, $h); 1926 $self->SUPER::configure ($x, $y, $w, $h);
1517 1927
1518 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1928 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1519 for @{$self->{children}}; 1929 for @{$self->{children}};
1520} 1930}
1521 1931
1522sub translate { 1932sub _topleft {
1523 my ($self, $x, $y) = @_; 1933 my ($self, $x, $y) = @_;
1524 1934
1525 ($x, $y) 1935 ($x, $y)
1526} 1936}
1527 1937
1528sub update { 1938sub update {
1529 my ($self) = @_; 1939 my ($self) = @_;
1530 1940
1531 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 1941 $self->check_size;
1532 ::refresh (); 1942 ::refresh ();
1533} 1943}
1534 1944
1535sub add { 1945sub add {
1536 my ($self, $widget) = @_; 1946 my ($self, $child) = @_;
1537 1947
1538 $self->SUPER::add ($widget); 1948 $self->SUPER::add ($child);
1949}
1539 1950
1540 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1951sub on_refresh {
1952 my ($self, $id, $cb) = @_;
1953
1954 $self->{refresh_hook}{$id} = $cb;
1541} 1955}
1542 1956
1543sub draw { 1957sub draw {
1544 my ($self) = @_; 1958 my ($self) = @_;
1545 1959
1960 while (my $rcb = delete $self->{refresh_hook}) {
1961 $_->() for values %$rcb;
1962 }
1963
1964 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1965 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1966 glClear GL_COLOR_BUFFER_BIT;
1967
1968 glMatrixMode GL_PROJECTION;
1969 glLoadIdentity;
1970 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1971 glMatrixMode GL_MODELVIEW;
1972 glLoadIdentity;
1973
1546 $self->_draw; 1974 $self->_draw;
1547} 1975}
1548 1976
1549############################################################################# 1977#############################################################################
1550 1978
1551package CFClient::UI; 1979package CFClient::UI;
1552 1980
1553$TOPLEVEL = new CFClient::UI::Toplevel; 1981$ROOT = new CFClient::UI::Root;
1554 1982
15551 19831
1556 1984

Diff Legend

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