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.108 by root, Fri Apr 14 23:32:29 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 $_ = int $_ for @$ws; #TODO: avoid rounding problems
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems
740
741 my $y;
742
743 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r]
745 or next;
746
629 my $ws = 0; 747 my $x = 0;
630 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 748 my $row_h = $hs->[$r];
631 my $c = ($self->{children}->[$yi] || [])->[$col]; 749
632 if ($c) { 750 for my $c (0 .. $#$row) {
633 my ($w, $h) = $c->size_request; 751 my $col_w = $ws->[$c];
634 if ($ws < $w) { $ws = $w } 752
753 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h);
755 }
756
757 $x += $col_w;
635 } 758 }
759
760 $y += $row_h;
636 } 761 }
637 return $ws; 762
638} 763}
764
765sub find_widget {
766 my ($self, $x, $y) = @_;
767
768 $x -= $self->{x};
769 $y -= $self->{y};
770
771 my $res;
772
773 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
774 $res = $_->find_widget ($x, $y)
775 and return $res;
776 }
777
778 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
779}
780
781sub _draw {
782 my ($self) = @_;
783
784 for (grep $_, @{$self->{children}}) {
785 $_->draw for grep $_, @$_;
786 }
787}
788
789#############################################################################
790
791package CFClient::UI::HBox;
792
793# TODO: wrap into common Box base class
794
795our @ISA = CFClient::UI::Container::;
639 796
640sub size_request { 797sub size_request {
641 my ($self) = @_; 798 my ($self) = @_;
642 799
800 my @alloc = map [$_->size_request], @{$self->{children}};
801
802 (
803 (List::Util::sum map $_->[0], @alloc),
804 (List::Util::max map $_->[1], @alloc),
805 )
806}
807
808sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812
643 my ($hs, $ws) = (0, 0); 813 ($h, $w) = ($w, $h);
644 814
645 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 815 my $children = $self->{children};
646 $hs += $self->max_row_height ($yi);
647 }
648 816
649 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 817 my @h = map +($_->size_request)[0], @$children;
650 my $wm = 0; 818
651 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 819 my $req_h = List::Util::sum @h;
652 $wm += $self->max_col_width ($xi) 820
821 if ($req_h > $h) {
822 # ah well, not enough space
823 $_ *= $h / $req_h for @h;
824 } else {
825 my $exp = List::Util::sum map $_->{expand}, @$children;
826 $exp ||= 1;
827
828 for (0 .. $#$children) {
829 my $child = $children->[$_];
830
831 my $alloc_h = $h[$_];
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h;
653 } 834 }
654 if ($ws < $wm) { $ws = $wm }
655 } 835 }
656
657 return ($ws, $hs);
658}
659
660sub _draw {
661 my ($self) = @_;
662 836
663 my $y = 0; 837 my $y = 0;
664 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 838 for (0 .. $#$children) {
665 my $x = 0; 839 my $child = $children->[$_];
840 my $h = int $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
666 842
667 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 843 $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 } 844 }
680} 845}
681 846
682############################################################################# 847#############################################################################
683 848
684package CFClient::Widget::VBox; 849package CFClient::UI::VBox;
685 850
851# TODO: wrap into common Box base class
852
686our @ISA = CFClient::Widget::Container::; 853our @ISA = CFClient::UI::Container::;
687
688use SDL::OpenGL;
689 854
690sub size_request { 855sub size_request {
691 my ($self) = @_; 856 my ($self) = @_;
692 857
693 my @alloc = map [$_->size_request], @{$self->{children}}; 858 my @alloc = map [$_->size_request], @{$self->{children}};
… …
697 (List::Util::sum map $_->[1], @alloc), 862 (List::Util::sum map $_->[1], @alloc),
698 ) 863 )
699} 864}
700 865
701sub size_allocate { 866sub size_allocate {
702 my ($self, $w, $h) = @_; 867 my ($self, $x, $y, $w, $h) = @_;
703 868
704 return unless $self->{w} != $w || $self->{h} != $h; 869 $self->_size_allocate ($x, $y, $w, $h);
705
706 $self->{w} = $w;
707 $self->{h} = $h;
708
709 return unless $self->{h};
710 870
711 my $children = $self->{children}; 871 my $children = $self->{children};
712 872
713 my @h = map +($_->size_request)[1], @$children; 873 my @h = map +($_->size_request)[1], @$children;
714 874
715 my $req_h = List::Util::sum @h; 875 my $req_h = List::Util::sum @h;
716 876
717 if ($req_h > $h) { 877 if ($req_h > $h) {
718 # ah well, not enough space 878 # ah well, not enough space
719 $_ = $h[$_] * $h / $req_h for @h; 879 $_ *= $h / $req_h for @h;
720 } else { 880 } else {
721 my @exp = grep $_->{expand}, @$children; 881 my $exp = List::Util::sum map $_->{expand}, @$children;
722 @exp = @$children unless @exp; 882 $exp ||= 1;
723 883
724 my %exp = map +($_ => 1), @exp;
725
726 for (0 .. $#$children) { 884 for (0 .. $#$children) {
727 my $child = $children->[$_]; 885 my $child = $children->[$_];
728 886
729 my $alloc_h = $h[$_]; 887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
730 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
731 $h[$_] = $alloc_h;
732 } 888 }
733 } 889 }
734 890
735 my $y = 0; 891 my $y = 0;
736 for (0 .. $#$children) { 892 for (0 .. $#$children) {
737 my $child = $children->[$_]; 893 my $child = $children->[$_];
738 my $h = $h[$_]; 894 my $h = int $h[$_];
739 $child->move (0, $y);
740 $child->size_allocate ($w, $h); 895 $child->size_allocate (0, $y, $w, $h);
741 896
742 $y += $h; 897 $y += $h;
743 } 898 }
744} 899}
745 900
746############################################################################# 901#############################################################################
747 902
748package CFClient::Widget::Label; 903package CFClient::UI::Label;
749 904
750our @ISA = CFClient::Widget::; 905our @ISA = CFClient::UI::Base::;
751 906
752use SDL::OpenGL; 907use SDL::OpenGL;
753 908
754sub new { 909sub new {
755 my ($class, %arg) = @_; 910 my ($class, %arg) = @_;
756 911
757 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
758 fg => [1, 1, 1], 913 fg => [1, 1, 1],
759 height => $::FONTSIZE, 914 fontsize => $::FONTSIZE,
760 text => "", 915 text => "",
761 align => -1, 916 align => -1,
917 padding => 2,
762 layout => new CFClient::Layout, 918 layout => new CFClient::Layout,
763 %arg 919 %arg
764 ); 920 );
765 921
766 $self->set_text ($self->{text}); 922 $self->set_text ($self->{text});
767 923
… …
783 939
784 $self->{text} = $text; 940 $self->{text} = $text;
785 $self->{layout}->set_markup ($text); 941 $self->{layout}->set_markup ($text);
786 942
787 delete $self->{texture}; 943 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
788 $self->update; 945 $self->update;
789} 946}
790 947
791sub get_text { 948sub get_text {
792 my ($self, $text) = @_; 949 my ($self, $text) = @_;
… …
796 953
797sub size_request { 954sub size_request {
798 my ($self) = @_; 955 my ($self) = @_;
799 956
800 $self->{layout}->set_width; 957 $self->{layout}->set_width;
801 $self->{layout}->set_height ($self->{height}); 958 $self->{layout}->set_height ($self->{fontsize});
802 $self->{layout}->size 959 my ($w, $h) = $self->{layout}->size;
803# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 960
804# ( 961 (
805# $self->{texture}{w}, 962 $w + $self->{padding} * 2,
806# $self->{texture}{h}, 963 $h + $self->{padding} * 2,
807# ) 964 )
808# } else {
809# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
810#
811# ($w, $h)
812# }
813} 965}
814 966
815sub size_allocate { 967sub size_allocate {
816 my ($self, $w, $h) = @_; 968 my ($self, $x, $y, $w, $h) = @_;
817 969
818 return unless $self->{w} != $w || $self->{h} != $h; 970 $self->_size_allocate ($x, $y, $w, $h) or return;
819 971
820 $self->SUPER::size_allocate ($w, $h);
821 delete $self->{texture}; 972 delete $self->{texture};
822} 973}
823 974
824sub update { 975sub update {
825 my ($self) = @_; 976 my ($self) = @_;
… …
831sub _draw { 982sub _draw {
832 my ($self) = @_; 983 my ($self) = @_;
833 984
834 my $tex = $self->{texture} ||= do { 985 my $tex = $self->{texture} ||= do {
835 $self->{layout}->set_width ($self->{w}); 986 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
836 new_from_layout CFClient::Texture $self->{layout}; 988 new_from_layout CFClient::Texture $self->{layout}
837 }; 989 };
838 990
839 glEnable GL_BLEND; 991 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
840 glEnable GL_TEXTURE_2D; 993 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; 994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
843 995
844 glColor @{$self->{fg}}; 996 glColor @{$self->{fg}};
845 997
846 my $x = 998 my $x =
847 $self->{align} < 0 ? 0 999 $self->{align} < 0 ? $self->{padding}
848 : $self->{align} > 0 ? $self->{w} - $self->{texture}{w} 1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
849 : ($self->{w} + $self->{texture}{w}) * 0.5; 1001 : ($self->{w} - $tex->{w}) * 0.5;
850 1002
851 $tex->draw_quad ($x, 0); 1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
852 1004
1005 glDisable GL_TEXTURE_2D;
853 glDisable GL_BLEND; 1006 glDisable GL_BLEND;
854 glDisable GL_TEXTURE_2D;
855} 1007}
856 1008
857############################################################################# 1009#############################################################################
858 1010
859package CFClient::Widget::Entry; 1011package CFClient::UI::Entry;
860 1012
861our @ISA = CFClient::Widget::Label::; 1013our @ISA = CFClient::UI::Label::;
862 1014
863use SDL; 1015use SDL;
864use SDL::OpenGL; 1016use SDL::OpenGL;
865 1017
866sub new { 1018sub new {
867 my $class = shift; 1019 my $class = shift;
868 1020
869 $class->SUPER::new ( 1021 $class->SUPER::new (
870 fg => [1, 1, 1], 1022 fg => [1, 1, 1],
871 bg => [0, 0, 0, 0.4], 1023 bg => [0, 0, 0, 0.2],
872 active_bg => [1, 1, 1], 1024 active_bg => [1, 1, 1, 0.5],
873 active_fg => [0, 0, 0], 1025 active_fg => [0, 0, 0],
1026 can_hover => 1,
1027 can_focus => 1,
874 @_ 1028 @_
875 ) 1029 )
876} 1030}
877 1031
878sub _set_text { 1032sub _set_text {
879 my ($self, $text) = @_; 1033 my ($self, $text) = @_;
880 1034
1035 my $old_text = $self->{text};
1036
881 $self->{last_activity} = $::NOW; 1037 $self->{last_activity} = $::NOW;
882 1038
883 $self->{text} = $text; 1039 $self->{text} = $text;
884 $self->{layout}->set_width ($self->{w}); 1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
885 1042
886 $text =~ s/./*/g if $self->{hidden}; 1043 $text =~ s/./*/g if $self->{hidden};
887 1044
888
889 $self->{layout}->set_markup ($self->escape_text ($text)); 1045 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
890 1046
891 $text = substr $text, 0, $self->{cursor}; 1047 $text = substr $text, 0, $self->{cursor};
892 utf8::encode $text; 1048 utf8::encode $text;
893 1049
894 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
895} 1054}
896 1055
897sub size_request { 1056sub size_request {
898 my ($self) = @_; 1057 my ($self) = @_;
899 1058
… …
901 1060
902 ($w + 1, $h) # add 1 for cursor 1061 ($w + 1, $h) # add 1 for cursor
903} 1062}
904 1063
905sub size_allocate { 1064sub size_allocate {
906 my ($self, $w, $h) = @_; 1065 my ($self, $x, $y, $w, $h) = @_;
907 1066
908 return unless $self->{w} != $w || $self->{h} != $h;
909
910 $self->SUPER::size_allocate ($w, $h); 1067 $self->SUPER::size_allocate ($x, $y, $w, $h);
911 1068
912 $self->_set_text ($self->{text}); 1069 $self->_set_text ($self->{text});
913} 1070}
914 1071
915sub set_text { 1072sub set_text {
… …
936 substr $text, $self->{cursor}, 1, ""; 1093 substr $text, $self->{cursor}, 1, "";
937 } elsif ($sym == SDLK_LEFT) { 1094 } elsif ($sym == SDLK_LEFT) {
938 --$self->{cursor} if $self->{cursor}; 1095 --$self->{cursor} if $self->{cursor};
939 } elsif ($sym == SDLK_RIGHT) { 1096 } elsif ($sym == SDLK_RIGHT) {
940 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1097 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1098 } elsif ($sym == SDLK_HOME) {
1099 $self->{cursor} = 0;
1100 } elsif ($sym == SDLK_END) {
1101 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) {
1103 $self->emit ('escape');
941 } elsif ($uni) { 1104 } elsif ($uni) {
942 substr $text, $self->{cursor}++, 0, chr $uni; 1105 substr $text, $self->{cursor}++, 0, chr $uni;
943 } 1106 }
944 1107
945 $self->_set_text ($text); 1108 $self->_set_text ($text);
… …
960 $self->SUPER::button_down ($ev, $x, $y); 1123 $self->SUPER::button_down ($ev, $x, $y);
961 1124
962 my $idx = $self->{layout}->xy_to_index ($x, $y); 1125 my $idx = $self->{layout}->xy_to_index ($x, $y);
963 1126
964 # byte-index to char-index 1127 # byte-index to char-index
965 my $text = $self->{layout}; 1128 my $text = $self->{text};
966 utf8::encode $text; 1129 utf8::encode $text;
967 $self->{cursor} = length substr $text, 0, $idx; 1130 $self->{cursor} = length substr $text, 0, $idx;
968 1131
969 $self->_set_text ($self->{text}); 1132 $self->_set_text ($self->{text});
970 $self->update; 1133 $self->update;
… …
985 $self->{fg} = $self->{active_fg}; 1148 $self->{fg} = $self->{active_fg};
986 } else { 1149 } else {
987 glColor @{$self->{bg}}; 1150 glColor @{$self->{bg}};
988 } 1151 }
989 1152
1153 glEnable GL_BLEND;
1154 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990 glBegin GL_QUADS; 1155 glBegin GL_QUADS;
991 glVertex 0 , 0; 1156 glVertex 0 , 0;
992 glVertex 0 , $self->{h}; 1157 glVertex 0 , $self->{h};
993 glVertex $self->{w}, $self->{h}; 1158 glVertex $self->{w}, $self->{h};
994 glVertex $self->{w}, 0; 1159 glVertex $self->{w}, 0;
995 glEnd; 1160 glEnd;
1161 glDisable GL_BLEND;
996 1162
997 $self->SUPER::_draw; 1163 $self->SUPER::_draw;
998 1164
999 #TODO: force update every cursor change :( 1165 #TODO: force update every cursor change :(
1000 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1004 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1005 glEnd; 1171 glEnd;
1006 } 1172 }
1007} 1173}
1008 1174
1009############################################################################# 1175package CFClient::UI::LineEntry;
1010 1176
1011package CFClient::Widget::Slider; 1177our @ISA = CFClient::UI::Entry::;
1012 1178
1013use strict; 1179use SDL;
1014
1015use SDL::OpenGL; 1180use SDL::OpenGL;
1016use SDL::OpenGL::Constants;
1017 1181
1018our @ISA = CFClient::Widget::DrawBG::; 1182sub key_down {
1019
1020sub size_request {
1021 my ($self) = @_; 1183 my ($self, $ev) = @_;
1022 1184
1023 my $w = 50; 1185 my $sym = $ev->key_sym;
1024 my $h = 10;
1025 1186
1026 $self->{vertical} ? ($h, $w) : ($w, $h) 1187 if ($sym == SDLK_RETURN) {
1188 $self->emit (activate => $self->get_text);
1189 $self->update;
1190
1191 } else {
1192 $self->SUPER::key_down ($ev);
1193 }
1194
1027} 1195}
1196
1197#############################################################################
1198
1199package CFClient::UI::Button;
1200
1201our @ISA = CFClient::UI::Label::;
1202
1203use SDL;
1204use SDL::OpenGL;
1205
1206my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1208 qw(b1_button_active.png);
1028 1209
1029sub new { 1210sub new {
1030 my $class = shift; 1211 my $class = shift;
1031 1212
1213 $class->SUPER::new (
1214 padding => 4,
1215 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0],
1218 can_hover => 1,
1219 @_
1220 )
1221}
1222
1223sub button_up {
1224 my ($self, $ev, $x, $y) = @_;
1225
1226 if ($x >= 0 && $x < $self->{w}
1227 && $y >= 0 && $y < $self->{h}) {
1228 $self->emit ("activate");
1229 }
1230}
1231
1232sub _draw {
1233 my ($self) = @_;
1234
1235 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
1237
1238 glEnable GL_BLEND;
1239 glEnable GL_TEXTURE_2D;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241
1242 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg};
1244 }
1245
1246 glBindTexture GL_TEXTURE_2D, $tex->{name};
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1248
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1250
1251 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND;
1253
1254 $self->SUPER::_draw;
1255}
1256
1257#############################################################################
1258
1259package CFClient::UI::CheckBox;
1260
1261our @ISA = CFClient::UI::DrawBG::;
1262
1263my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266
1267use SDL;
1268use SDL::OpenGL;
1269
1270sub new {
1271 my $class = shift;
1272
1273 $class->SUPER::new (
1274 padding => 2,
1275 fg => [1, 1, 1],
1276 active_fg => [1, 1, 0],
1277 state => 0,
1278 can_hover => 1,
1279 @_
1280 )
1281}
1282
1283sub size_request {
1284 my ($self) = @_;
1285
1286 ($self->{padding} * 2 + 6) x 2
1287}
1288
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down {
1296 my ($self, $ev, $x, $y) = @_;
1297
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1300 $self->{state} = !$self->{state};
1301 $self->emit (changed => $self->{state});
1302 }
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 $self->SUPER::_draw;
1309
1310 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1311
1312 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1313
1314 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1315
1316 glEnable GL_BLEND;
1317 glEnable GL_TEXTURE_2D;
1318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1319
1320 my $tex = $self->{state} ? $tex[1] : $tex[0];
1321
1322 $tex->draw_quad (0, 0, $s, $s);
1323
1324 glDisable GL_TEXTURE_2D;
1325 glDisable GL_BLEND;
1326}
1327
1328#############################################################################
1329
1330package CFClient::UI::Slider;
1331
1332use strict;
1333
1334use SDL::OpenGL;
1335
1336our @ISA = CFClient::UI::DrawBG::;
1337
1338my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1340 qw(s1_slider.png s1_slider_bg.png);
1341
1342sub new {
1343 my $class = shift;
1344
1032 # range [value, low, high, page] 1345 # range [value, low, high, page]
1033 1346
1347 # TODO: 0-width page
1348 # TODO: req_w/h are wrong with vertical
1349 # TODO: calculations are off
1034 $class->SUPER::new ( 1350 my $self = $class->SUPER::new (
1035 fg => [1, 1, 1], 1351 fg => [1, 1, 1],
1036 active_fg => [0, 0, 0], 1352 active_fg => [0, 0, 0],
1037 range => [0, 0, 100, 10], 1353 range => [0, 0, 100, 10],
1354 req_w => 40,
1355 req_h => 13,
1038 vertical => 1, 1356 vertical => 0,
1357 can_hover => 1,
1358 inner_pad => 5,
1039 @_ 1359 @_
1040 ) 1360 );
1361
1362 $self
1363}
1364
1365sub size_request {
1366 my ($self) = @_;
1367
1368 my $w = $self->{req_w};
1369 my $h = $self->{req_h};
1370
1371 $self->{vertical} ? ($h, $w) : ($w, $h)
1041} 1372}
1042 1373
1043sub button_down { 1374sub button_down {
1044 my ($self, $ev, $x, $y) = @_; 1375 my ($self, $ev, $x, $y) = @_;
1045 1376
… …
1053 if ($GRAB == $self) { 1384 if ($GRAB == $self) {
1054 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1385 my ($value, $lo, $hi, $page) = @{$self->{range}};
1055 1386
1056 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1387 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1057 1388
1389 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1390 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1391
1392 $x -= $inner_pad_px; # substract the padding
1058 $x = $x * ($hi - $lo) / $w + $lo; 1393 $x = $x * ($hi - $lo) / $inner_w + $lo;
1059 $x = $lo if $x < $lo; 1394 $x = $lo if $x < $lo;
1060 $x = $hi - $page if $x > $hi - $page; 1395 $x = $hi - $page if $x > $hi - $page;
1061 $self->{range}[0] = $x; 1396 $self->{range}[0] = $x;
1062 1397
1063 $self->emit (changed => $x); 1398 $self->emit (changed => $x);
1064 $self->update; 1399 $self->update;
1065 } 1400 }
1401}
1402
1403# the inner_* stuff is for generating a padding for the slider handle,
1404# so that the handle doesn't leave the texture. This calculation isn't 100%
1405# correct propably, but it does the job for now
1406sub _calc_inner_pad_px {
1407 my ($self, $w) = @_;
1408 ($w / 100) * $self->{inner_pad} # % to pixels
1066} 1409}
1067 1410
1068sub _draw { 1411sub _draw {
1069 my ($self) = @_; 1412 my ($self) = @_;
1070 1413
… …
1084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1427 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1428 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1086 1429
1087 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1088 1431
1432 $hi = $value + 1 if $lo == $hi;
1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1089 $page = int $page * $w / ($hi - $lo); 1437 $page = int $page * $inner_w / ($hi - $lo);
1090 $value = int +($value - $lo) * $w / ($hi - $lo); 1438 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1091 1439
1092 $w -= $page; 1440 $w -= $page;
1093 $page &= ~1; 1441 $page &= ~1;
1094 glTranslate $page * 0.5, 0, 0; 1442 glTranslate $page * 0.5, 0, 0;
1443 $page ||= 2;
1095 1444
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; 1445 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1104 my $knob_b = $value + $page * 0.5; 1446 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1105 1447
1106 glBegin GL_QUADS; 1448 glEnable GL_BLEND;
1107 glColor @$fg; 1449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1108 glVertex $knob_a, 0; 1450 glEnable GL_TEXTURE_2D;
1109 glVertex $knob_a, $h; 1451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1110 glVertex $knob_b, $h;
1111 glVertex $knob_b, 0;
1112 1452
1113 if ($knob_a < $knob_b - 2) { 1453 # draw background
1114 glColor @$bg; 1454 $tex[1]->draw_quad (0, 0, $w, $h);
1115 glVertex $knob_a + 1, 1; 1455
1116 glVertex $knob_a + 1, $h - 1; 1456 # draw handle
1117 glVertex $knob_b - 1, $h - 1; 1457 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1118 glVertex $knob_b - 1, 1; 1458
1459 glDisable GL_BLEND;
1460 glDisable GL_TEXTURE_2D;
1461}
1462
1463#############################################################################
1464
1465package CFClient::UI::TextView;
1466
1467our @ISA = CFClient::UI::HBox::;
1468
1469use SDL::OpenGL;
1470
1471sub new {
1472 my $class = shift;
1473
1474 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6,
1476 req_h => $::HEIGHT / 6,
1477 fontsize => $::FONTSIZE,
1478 @_,
1479
1480 layout => (new CFClient::Layout),
1481 par => [],
1482 height => 0,
1483 children => [
1484 (new CFClient::UI::Empty expand => 1),
1485 (new CFClient::UI::Slider vertical => 1),
1486 ],
1487 );
1488
1489 $self->{children}[1]->connect (changed => sub {
1490 $self->update;
1491 });
1492
1493 $self
1494}
1495
1496sub set_fontsize {
1497 my ($self, $fontsize) = @_;
1498
1499 $self->{fontsize} = $fontsize;
1500 $self->reflow;
1501}
1502
1503sub text_height {
1504 my ($self, $text) = @_;
1505
1506 my $layout = $self->{layout};
1507
1508 $layout->set_height ($self->{fontsize});
1509 $layout->set_width ($self->{w});
1510 $layout->set_text ($text);
1119 } 1511
1120 glEnd; 1512 ($layout->size)[1]
1121} 1513}
1122 1514
1123############################################################################# 1515sub reflow {
1516 my ($self) = @_;
1124 1517
1518 $self->{need_reflow}++;
1519 $self->update;
1520}
1521
1522sub size_request {
1523 my ($self) = @_;
1524
1525 ($self->{req_w}, $self->{req_h})
1526}
1527
1528sub size_allocate {
1529 my ($self, $x, $y, $w, $h) = @_;
1530
1531 $self->SUPER::size_allocate ($x, $y, $w, $h);
1532
1533 $self->{layout}->set_height ($self->{fontsize});
1534 $self->{layout}->set_width ($self->{w});
1535
1536 $self->reflow;
1537}
1538
1539sub add_paragraph {
1540 my ($self, $color, $text) = @_;
1541
1542 #TODO: intelligently "reformat" paragraph
1543
1544 my $height = $self->text_height ($text);
1545
1546 $self->{height} += $height;
1547
1548 push @{$self->{par}}, [$height, $color, $text];
1549
1550 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1551 $self->{children}[1]->update;
1552}
1553
1554sub update {
1555 my ($self) = @_;
1556
1557 $self->SUPER::update;
1558
1559 return unless $self->{h} > 0;
1560
1561 delete $self->{texture};
1562
1563 $TOPLEVEL->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) {
1565 my $height = 0;
1566
1567 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}};
1569
1570 $self->{height} = $height;
1571
1572 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1573
1574 delete $self->{texture};
1575 }
1576
1577 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1578 glClearColor 0, 0, 0, 1;
1579 glClear GL_COLOR_BUFFER_BIT;
1580
1581 glEnable GL_BLEND;
1582 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1583 glEnable GL_TEXTURE_2D;
1584 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1585
1586 my $top = int $self->{children}[1]{range}[0];
1587
1588 my $y0 = $top;
1589 my $y1 = $top + $self->{h};
1590
1591 my $y = 0;
1592
1593 my $layout = $self->{layout};
1594
1595 for my $par (@{$self->{par}}) {
1596 my $h = $par->[0];
1597
1598 if ($y0 < $y + $h && $y < $y1) {
1599 $layout->set_text ($par->[2]);
1600
1601 glColor @{ $par->[1] };
1602 my ($W, $H) = $layout->size;
1603 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1604 }
1605
1606 $y += $h;
1607 }
1608
1609 glDisable GL_TEXTURE_2D;
1610 glDisable GL_BLEND;
1611 };
1612 });
1613}
1614
1615sub _draw {
1616 my ($self) = @_;
1617
1618 if ($self->{texture}) {
1619 glEnable GL_TEXTURE_2D;
1620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1621 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1622 glDisable GL_TEXTURE_2D;
1623 }
1624
1625 $self->{children}[1]->draw;
1626
1627}
1628
1629#############################################################################
1630
1125package CFClient::Widget::MapWidget; 1631package CFClient::UI::MapWidget;
1126 1632
1127use strict; 1633use strict;
1128 1634
1129use List::Util qw(min max); 1635use List::Util qw(min max);
1130 1636
1131use SDL; 1637use SDL;
1132use SDL::OpenGL; 1638use SDL::OpenGL;
1133use SDL::OpenGL::Constants;
1134 1639
1135our @ISA = CFClient::Widget::; 1640our @ISA = CFClient::UI::Base::;
1136 1641
1137sub new { 1642sub new {
1138 my $class = shift; 1643 my $class = shift;
1139 1644
1140 $class->SUPER::new ( 1645 $class->SUPER::new (
1141 z => -1, 1646 z => -1,
1647 can_focus => 1,
1142 list => (glGenLists 1), 1648 list => (glGenLists 1),
1143 @_ 1649 @_
1144 ) 1650 )
1145} 1651}
1146 1652
1147sub key_down { 1653sub key_down {
… …
1149} 1655}
1150 1656
1151sub key_up { 1657sub key_up {
1152} 1658}
1153 1659
1660sub button_down {
1661 my ($self, $ev, $x, $y) = @_;
1662
1663 $self->focus_in;
1664
1665 if ($ev->button == 2) {
1666 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1667 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1668
1669 $self->{motion} = sub {
1670 my ($ev, $x, $y) = @_;
1671
1672 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1673
1674 $::CFG->{map_shift_x} = $bw + $x - $ox;
1675 $::CFG->{map_shift_y} = $bh + $y - $oy;
1676
1677 $self->update;
1678 };
1679 }
1680}
1681
1682sub button_up {
1683 my ($self, $ev, $x, $y) = @_;
1684
1685 delete $self->{motion};
1686}
1687
1688sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_;
1690
1691 $self->{motion}->($ev, $x, $y) if $self->{motion};
1692}
1693
1154sub size_request { 1694sub size_request {
1155 ( 1695 (
1156 1 + int $::WIDTH / 32, 1696 1 + 32 * int $::WIDTH / 32,
1157 1 + int $::HEIGHT / 32, 1697 1 + 32 * int $::HEIGHT / 32,
1158 ) 1698 )
1159} 1699}
1160 1700
1161sub update { 1701sub update {
1162 my ($self) = @_; 1702 my ($self) = @_;
1163 1703
1164 $self->{need_update} = 1; 1704 $self->{need_update} = 1;
1705 $self->SUPER::update;
1165} 1706}
1166 1707
1167sub _draw { 1708sub draw {
1168 my ($self) = @_; 1709 my ($self) = @_;
1169 1710
1170 if (delete $self->{need_update}) { 1711 if (delete $self->{need_update}) {
1171 glNewList $self->{list}, GL_COMPILE; 1712 glNewList $self->{list}, GL_COMPILE;
1172 1713
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; 1714 my $sw = int $::WIDTH / 32;
1181 my $sh = 1 + int $::HEIGHT / 32; 1715 my $sh = int $::HEIGHT / 32;
1182 1716
1183 if ($::CONN->{mapw} > $sw) { 1717 if ($::MAP) {
1184 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1718 my $sx = $::CFG->{map_shift_x};
1185 } else { 1719 my $sy = $::CFG->{map_shift_y};
1186 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1187 }
1188 1720
1189 if ($::CONN->{maph} > $sh) { 1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
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 1722
1195 glEnable GL_TEXTURE_2D; 1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1196 glEnable GL_BLEND;
1197 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1198 1724
1199 my $sw4 = ($sw + 3) & ~3; 1725 if ($::CFG->{fow_enable}) {
1200 my $darkness = "\x00" x ($sw4 * $sh); 1726 if ($::CFG->{fow_smooth}) { # smooth fog of war
1201 1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1202 for my $x (0 .. $sw - 1) { 1728 glConvolutionFilter2D
1203 my $row = $map->[$x + $xofs]; 1729 GL_CONVOLUTION_2D,
1204 for my $y (0 .. $sh - 1) { 1730 GL_ALPHA,
1205 1731 3, 3,
1206 my $cell = $row->[$y + $yofs] 1732 GL_ALPHA, GL_FLOAT,
1733 pack "f*",
1734 0.1, 0.1, 0.1,
1735 0.1, 0.2, 0.1,
1736 0.1, 0.1, 0.1,
1207 or next; 1737 ;
1208 1738 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 } 1739 }
1215 1740
1216 for my $num (grep $_, @$cell[1,2,3]) { 1741 my $tex = new CFClient::Texture
1217 my $tex = $::CONN->{face}[$num]{texture} || next; 1742 w => $w,
1218 1743 h => $h,
1219 my ($w, $h) = @$tex{qw(w h)}; 1744 data => $data,
1745 internalformat => GL_ALPHA,
1746 format => GL_ALPHA;
1220 1747
1221 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1748 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1222 } 1749
1750 glEnable GL_BLEND;
1751 glEnable GL_TEXTURE_2D;
1752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1753
1754 glColor +($::CFG->{fow_intensity}) x 3, 1;
1755 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1756
1757 glDisable GL_TEXTURE_2D;
1758 glDisable GL_BLEND;
1223 } 1759 }
1224 } 1760 }
1225 1761
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; 1762 glEndList;
1253 } 1763 }
1254 1764
1765 glPushMatrix;
1255 glCallList $self->{list}; 1766 glCallList $self->{list};
1767 glPopMatrix;
1768
1769 if ($FOCUS != $self) {
1770 glColor 64/255, 64/255, 64/255;
1771 glLogicOp GL_AND;
1772 glEnable GL_COLOR_LOGIC_OP;
1773 glBegin GL_QUADS;
1774 glVertex 0, 0;
1775 glVertex 0, $::HEIGHT;
1776 glVertex $::WIDTH, $::HEIGHT;
1777 glVertex $::WIDTH, 0;
1778 glEnd;
1779 glDisable GL_COLOR_LOGIC_OP;
1780 }
1256} 1781}
1257 1782
1258my %DIR = ( 1783my %DIR = (
1259 SDLK_KP8, [1, "north"], 1784 SDLK_KP8, [1, "north"],
1260 SDLK_KP9, [2, "northeast"], 1785 SDLK_KP9, [2, "northeast"],
… …
1276 1801
1277 my $mod = $ev->key_mod; 1802 my $mod = $ev->key_mod;
1278 my $sym = $ev->key_sym; 1803 my $sym = $ev->key_sym;
1279 1804
1280 if ($sym == SDLK_KP5) { 1805 if ($sym == SDLK_KP5) {
1281 $::CONN->send ("command stay fire"); 1806 $::CONN->user_send ("command stay fire");
1807 } elsif ($sym == SDLK_a) {
1808 $::CONN->user_send ("command apply");
1809 } elsif ($sym == SDLK_QUOTE) {
1810 $self->emit ('activate_console');
1811 } elsif ($sym == SDLK_SLASH) {
1812 $self->emit ('activate_console' => '/');
1282 } elsif (exists $DIR{$sym}) { 1813 } elsif (exists $DIR{$sym}) {
1283 if ($mod & KMOD_SHIFT) { 1814 if ($mod & KMOD_SHIFT) {
1284 $self->{shft}++; 1815 $self->{shft}++;
1285 $::CONN->send ("command fire $DIR{$sym}[0]"); 1816 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1286 } elsif ($mod & KMOD_CTRL) { 1817 } elsif ($mod & KMOD_CTRL) {
1287 $self->{ctrl}++; 1818 $self->{ctrl}++;
1288 $::CONN->send ("command run $DIR{$sym}[0]"); 1819 $::CONN->user_send ("command run $DIR{$sym}[0]");
1289 } else { 1820 } else {
1290 $::CONN->send ("command $DIR{$sym}[1]"); 1821 $::CONN->user_send ("command $DIR{$sym}[1]");
1291 } 1822 }
1292 } 1823 }
1293} 1824}
1294 1825
1295sub key_up { 1826sub key_up {
… …
1297 1828
1298 my $mod = $ev->key_mod; 1829 my $mod = $ev->key_mod;
1299 my $sym = $ev->key_sym; 1830 my $sym = $ev->key_sym;
1300 1831
1301 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1832 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1302 $::CONN->send ("command fire_stop"); 1833 $::CONN->user_send ("command fire_stop");
1303 } 1834 }
1304 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1835 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1305 $::CONN->send ("command run_stop"); 1836 $::CONN->user_send ("command run_stop");
1306 } 1837 }
1307} 1838}
1308 1839
1309############################################################################# 1840#############################################################################
1310 1841
1311package CFClient::Widget::Animator; 1842package CFClient::UI::Animator;
1312 1843
1313use SDL::OpenGL; 1844use SDL::OpenGL;
1314 1845
1315our @ISA = CFClient::Widget::Bin::; 1846our @ISA = CFClient::UI::Bin::;
1316 1847
1317sub moveto { 1848sub moveto {
1318 my ($self, $x, $y) = @_; 1849 my ($self, $x, $y) = @_;
1319 1850
1320 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1851 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1348 glPopMatrix; 1879 glPopMatrix;
1349} 1880}
1350 1881
1351############################################################################# 1882#############################################################################
1352 1883
1884package CFClient::UI::Flopper;
1885
1886our @ISA = CFClient::UI::Button::;
1887
1888sub new {
1889 my $class = shift;
1890
1891 my $self = $class->SUPER::new (
1892 state => 0,
1893 connect_activate => \&toggle_flopper,
1894 @_
1895 );
1896
1897 if ($self->{state}) {
1898 $self->{state} = 0;
1899 $self->toggle_flopper;
1900 }
1901
1902 $self
1903}
1904
1905sub toggle_flopper {
1906 my ($self) = @_;
1907
1908 # TODO: use animation
1909 if ($self->{state} = !$self->{state}) {
1910 $CFClient::UI::TOPLEVEL->add ($self->{other});
1911 $self->{other}->move (
1912 ($::WIDTH - $self->{other}{w}) * 0.5,
1913 ($::HEIGHT - $self->{other}{h}) * 0.5,
1914 );
1915 } else {
1916 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1917 }
1918}
1919
1920#############################################################################
1921
1353package CFClient::Widget::Toplevel; 1922package CFClient::UI::Toplevel;
1354 1923
1355our @ISA = CFClient::Widget::Container::; 1924our @ISA = CFClient::UI::Container::;
1925
1926use SDL::OpenGL;
1356 1927
1357sub size_request { 1928sub size_request {
1358 ($::WIDTH, $::HEIGHT) 1929 ($::WIDTH, $::HEIGHT)
1359} 1930}
1360 1931
1361sub size_allocate { 1932sub size_allocate {
1362 my ($self, $w, $h) = @_; 1933 my ($self, $x, $y, $w, $h) = @_;
1363 1934
1364 $self->SUPER::size_allocate ($w, $h); 1935 $self->_size_allocate ($x, $y, $w, $h);
1365 1936
1366 $_->size_allocate ($_->size_request) 1937 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1367 for @{$self->{children}}; 1938 for @{$self->{children}};
1368} 1939}
1369 1940
1370sub translate { 1941sub translate {
1371 my ($self, $x, $y) = @_; 1942 my ($self, $x, $y) = @_;
… …
1374} 1945}
1375 1946
1376sub update { 1947sub update {
1377 my ($self) = @_; 1948 my ($self) = @_;
1378 1949
1379 $self->size_allocate ($self->size_request); 1950 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1380 ::refresh (); 1951 ::refresh ();
1381} 1952}
1382 1953
1383sub add { 1954sub add {
1384 my ($self, $widget) = @_; 1955 my ($self, $widget) = @_;
1385 1956
1386 $self->SUPER::add ($widget); 1957 $self->SUPER::add ($widget);
1387 1958
1388 $widget->size_allocate ($widget->size_request); 1959 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1960}
1961
1962sub on_refresh {
1963 my ($self, $id, $cb) = @_;
1964
1965 $self->{refresh_hook}{$id} = $cb;
1389} 1966}
1390 1967
1391sub draw { 1968sub draw {
1392 my ($self) = @_; 1969 my ($self) = @_;
1393 1970
1971 while (my $rcb = delete $self->{refresh_hook}) {
1972 $_->() for values %$rcb;
1973 }
1974
1975 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1976 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1977 glClear GL_COLOR_BUFFER_BIT;
1978
1979 glMatrixMode GL_PROJECTION;
1980 glLoadIdentity;
1981 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1982 glMatrixMode GL_MODELVIEW;
1983 glLoadIdentity;
1984
1394 $self->_draw; 1985 $self->_draw;
1395} 1986}
1396 1987
1397############################################################################# 1988#############################################################################
1398 1989
1399package CFClient::Widget; 1990package CFClient::UI;
1400 1991
1401$TOPLEVEL = new CFClient::Widget::Toplevel; 1992$TOPLEVEL = new CFClient::UI::Toplevel;
1402 1993
14031 19941
1404 1995

Diff Legend

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