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

Diff Legend

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