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.72 by root, Tue Apr 11 18:00:45 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines