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

Diff Legend

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