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.73 by root, Tue Apr 11 18:06:53 2006 UTC vs.
Revision 1.135 by root, Wed Apr 19 06:21:07 2006 UTC

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

Diff Legend

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