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.69 by root, Tue Apr 11 17:32:14 2006 UTC vs.
Revision 1.98 by root, Fri Apr 14 02:06:22 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;
… …
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}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
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}
… …
155 return unless $self->{h} && $self->{w}; 185 return unless $self->{h} && $self->{w};
156 186
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 if ($self == $HOVER) { 190 glPopMatrix;
161 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
162 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
163 glBegin GL_QUADS; 198 glBegin GL_QUADS;
164 glVertex 0 , 0; 199 glVertex $x , $y;
165 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
166 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
167 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
168 glEnd; 203 glEnd;
169 glDisable GL_BLEND; 204 glDisable GL_BLEND;
170 } 205 }
171 glPopMatrix;
172} 206}
173 207
174sub _draw { 208sub _draw {
175 my ($self) = @_; 209 my ($self) = @_;
176 210
177 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
178}
179
180sub bbox {
181 my ($self) = @_;
182 my ($w, $h) = $self->size_request;
183 (
184 $self->{x},
185 $self->{y},
186 $self->{x} = $w,
187 $self->{y} = $h
188 )
189} 212}
190 213
191sub find_widget { 214sub find_widget {
192 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
193 216
… …
196 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
197 220
198 () 221 ()
199} 222}
200 223
201sub del_parent { $_[0]->{parent} = undef }
202
203sub set_parent { 224sub set_parent {
204 my ($self, $par) = @_; 225 my ($self, $par) = @_;
205 226
206 $self->{parent} = $par; 227 $self->{parent} = $par;
207 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
216 237
217 $self->{parent}->update 238 $self->{parent}->update
218 if $self->{parent}; 239 if $self->{parent};
219} 240}
220 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
221sub DESTROY { 255sub DESTROY {
222 my ($self) = @_; 256 my ($self) = @_;
223 257
224 #$self->deactivate; 258 #$self->deactivate;
225} 259}
226 260
227############################################################################# 261#############################################################################
228 262
229package CFClient::Widget::DrawBG; 263package CFClient::UI::DrawBG;
230 264
231our @ISA = CFClient::Widget::; 265our @ISA = CFClient::UI::Base::;
232 266
233use strict; 267use strict;
234use SDL::OpenGL; 268use SDL::OpenGL;
235 269
236sub new { 270sub new {
237 my $class = shift; 271 my $class = shift;
238 272
239 # range [value, low, high, page] 273 # range [value, low, high, page]
240 274
241 $class->SUPER::new ( 275 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4], 276 bg => [0, 0, 0, 0.2],
243 active_bg => [1, 1, 1], 277 active_bg => [1, 1, 1, 0.5],
244 @_ 278 @_
245 ) 279 )
246} 280}
247 281
248sub _draw { 282sub _draw {
249 my ($self) = @_; 283 my ($self) = @_;
250 284
251 my ($w, $h) = @$self{qw(w h)}; 285 my ($w, $h) = @$self{qw(w h)};
252 286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
254 glBegin GL_QUADS; 291 glBegin GL_QUADS;
255 glVertex 0 , 0; 292 glVertex 0 , 0;
256 glVertex 0 , $h; 293 glVertex 0 , $h;
257 glVertex $w, $h; 294 glVertex $w, $h;
258 glVertex $w, 0; 295 glVertex $w, 0;
259 glEnd; 296 glEnd;
260}
261 297
262############################################################################# 298 glDisable GL_BLEND;
299}
263 300
301#############################################################################
302
264package CFClient::Widget::Empty; 303package CFClient::UI::Empty;
265 304
266our @ISA = CFClient::Widget::; 305our @ISA = CFClient::UI::Base::;
267 306
268sub size_request { 307sub size_request {
269 (0, 0) 308 (0, 0)
270} 309}
271 310
272sub draw { } 311sub draw { }
273 312
274############################################################################# 313#############################################################################
275 314
276package CFClient::Widget::Container; 315package CFClient::UI::Container;
277 316
278our @ISA = CFClient::Widget::; 317our @ISA = CFClient::UI::Base::;
279 318
280sub new { 319sub new {
281 my ($class, %arg) = @_; 320 my ($class, %arg) = @_;
282 321
283 my $children = delete $arg{children} || []; 322 my $children = delete $arg{children} || [];
… …
287 326
288 $self 327 $self
289} 328}
290 329
291sub add { 330sub add {
292 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
293 332
294 $chld->{expand} = $expand;
295 $chld->set_parent ($self); 333 $chld->set_parent ($self);
296 334
297 $self->{children} = [ 335 $self->{children} = [
298 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
299 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
300 ]; 338 ];
301 339
302 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
303 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
304} 342}
305 343
306sub remove { 344sub remove {
307 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
308 346
309 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
310 348
311 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
312} 350}
313 351
314sub find_widget { 352sub find_widget {
315 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
316 354
… …
333 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
334} 372}
335 373
336############################################################################# 374#############################################################################
337 375
338package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
339 377
340our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
341 379
342sub new { 380sub new {
343 my ($class, %arg) = @_; 381 my ($class, %arg) = @_;
344 382
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
346 384
347 $class->SUPER::new (children => [$child], %arg) 385 $class->SUPER::new (children => [$child], %arg)
348} 386}
349 387
350sub add { 388sub add {
… …
358sub remove { 396sub remove {
359 my ($self, $widget) = @_; 397 my ($self, $widget) = @_;
360 398
361 $self->SUPER::remove ($widget); 399 $self->SUPER::remove ($widget);
362 400
363 $self->{children} = [new CFClient::Widget::Empty] 401 $self->{children} = [new CFClient::UI::Empty]
364 unless @{$self->{children}}; 402 unless @{$self->{children}};
365} 403}
366 404
367sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
368 406
369sub size_request { 407sub size_request {
370 $_[0]{children}[0]->size_request 408 $_[0]{children}[0]->size_request
371} 409}
372 410
373sub size_allocate { 411sub size_allocate {
374 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
375 413
376 return unless $self->{w} != $w || $self->{h} != $h; 414 $self->_size_allocate ($x, $y, $w, $h) or return;
377 415
378 $self->SUPER::size_allocate ($w, $h);
379 $self->{children}[0]->size_allocate ($w, $h); 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
380} 417}
381 418
382############################################################################# 419#############################################################################
383 420
384package CFClient::Widget::Window; 421package CFClient::UI::Window;
385 422
386our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
387 424
388use SDL::OpenGL; 425use SDL::OpenGL;
389 426
390sub new { 427sub new {
391 my ($class, %arg) = @_; 428 my ($class, %arg) = @_;
… …
409 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
410 ); 447 );
411} 448}
412 449
413sub size_allocate { 450sub size_allocate {
414 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
415 452
416 return unless $self->{w} != $w || $self->{h} != $h; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
417 454
418 $self->{w} = $w;
419 $self->{h} = $h;
420
421 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
422 456
423 $self->render_chld; 457 $self->render_chld;
424} 458}
425 459
426sub _draw { 460sub _draw {
… …
430 464
431 my $tex = $self->{texture} 465 my $tex = $self->{texture}
432 or return; 466 or return;
433 467
434 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
435 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
437 472
438 $tex->draw_quad (0, 0, $w, $h); 473 $tex->draw_quad (0, 0, $w, $h);
439 474
… …
441 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
442} 477}
443 478
444############################################################################# 479#############################################################################
445 480
446package CFClient::Widget::Frame; 481package CFClient::UI::Frame;
447 482
448our @ISA = CFClient::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
449 484
450use SDL::OpenGL; 485use SDL::OpenGL;
451 486
452sub size_request { 487sub size_request {
453 my ($self) = @_; 488 my ($self) = @_;
… …
458 493
459 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
460} 495}
461 496
462sub size_allocate { 497sub size_allocate {
463 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
464 499
465 return unless $self->{w} != $w || $self->{h} != $h; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
466 501
467 $self->{w} = $w;
468 $self->{h} = $h;
469
470 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
471 $self->child->move (2, 2);
472} 503}
473 504
474sub _draw { 505sub _draw {
475 my ($self) = @_; 506 my ($self) = @_;
476 507
… …
489 $chld->draw; 520 $chld->draw;
490} 521}
491 522
492############################################################################# 523#############################################################################
493 524
494package CFClient::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
495 526
496our @ISA = CFClient::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
497 528
498use SDL::OpenGL; 529use SDL::OpenGL;
499 530
500my @tex = 531my @tex =
501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
503 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
504sub size_request { 548sub size_request {
505 my ($self) = @_; 549 my ($self) = @_;
506 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
507 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
508 554
509 $h += $tex[1]->{height}; 555 (
510 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
511 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
512 $w += $tex[3]->{width}; 558 )
513
514 ($w, $h)
515} 559}
516 560
517sub size_allocate { 561sub size_allocate {
518 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
519 563
520 return unless $self->{w} != $w || $self->{h} != $h; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
521 565
522 $self->SUPER::size_allocate ($w, $h); 566 $h -= List::Util::max 0, $self->{border} * 2;
567 $w -= List::Util::max 0, $self->{border} * 2;
523 568
524 $h -= $tex[1]->{height}; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
525 $h -= $tex[4]->{height}; 570}
526 $w -= $tex[2]->{width};
527 $w -= $tex[3]->{width};
528 571
529 $h = $h < 0 ? 0 : $h; 572sub button_down {
530 $w = $w < 0 ? 0 : $w; 573 my ($self, $ev, $x, $y) = @_;
531 574
532 my $child = $self->child; 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
533 577
534 $child->size_allocate ($w, $h); 578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
535 $child->move ($tex[3]->{width}, $tex[1]->{height}); 579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
536} 618}
537 619
538sub _draw { 620sub _draw {
539 my ($self) = @_; 621 my ($self) = @_;
540 622
541 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
542 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
543 625
544 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
545 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
548 630
549 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
550 $top->draw_quad (0, 0, $w, $top->{height}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
551 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
552 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
554
555 my $right = $tex[2];
556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
557
558 my $bottom = $tex[4];
559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
560 636
561 my $bg = $tex[0]; 637 my $bg = $tex[0];
562 glBindTexture GL_TEXTURE_2D, $bg->{name};
563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
566 638
639 # TODO: repeat texture not scale
567 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
568 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
569 642
643 glColor @{ $self->{bg} };
570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
571 645
646 glDisable GL_TEXTURE_2D;
572 glDisable GL_BLEND; 647 glDisable GL_BLEND;
573 glDisable GL_TEXTURE_2D;
574 648
575 $self->child->draw; 649 $self->child->draw;
576
577} 650}
578 651
579############################################################################# 652#############################################################################
580 653
581package CFClient::Widget::Table; 654package CFClient::UI::Table;
582 655
583our @ISA = CFClient::Widget::Bin::; 656our @ISA = CFClient::UI::Base::;
657
658use List::Util qw(max sum);
584 659
585use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
586 670
587sub add { 671sub add {
588 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
589 my $old_chld = $self->{children}[$y][$x];
590 673
591 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
592 $chld->set_parent ($self); 675 $chld->set_parent ($self);
676
677 $self->{w} = $self->{h} = -1;
593 $self->update; 678 $self->update;
594} 679}
595 680
596sub max_row_height { 681sub get_wh {
597 my ($self, $row) = @_; 682 my ($self) = @_;
598 683
599 my $hs = 0; 684 my (@w, @h);
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 685
686 for my $y (0 .. $#{$self->{children}}) {
601 my $c = $self->{children}->[$row]->[$xi]; 687 my $row = $self->{children}[$y]
602 if ($c) { 688 or next;
689
690 for my $x (0 .. $#$row) {
691 my $widget = $row->[$x]
692 or next;
603 my ($w, $h) = $c->size_request; 693 my ($w, $h) = $widget->size_request;
604 if ($hs < $h) { $hs = $h } 694
695 $w[$x] = max $w[$x], $w;
696 $h[$y] = max $h[$y], $h;
605 } 697 }
606 } 698 }
607 return $hs;
608}
609 699
610sub max_col_width { 700 (\@w, \@h)
701}
702
703sub size_request {
611 my ($self, $col) = @_; 704 my ($self) = @_;
612 705
706 my ($ws, $hs) = $self->get_wh;
707
708 (
709 (sum @$ws),
710 (sum @$hs),
711 )
712}
713
714sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718
719 my ($ws, $hs) = $self->get_wh;
720
721 my $req_w = sum @$ws;
722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
728
729 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
732
733 my $y;
734
735 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r]
737 or next;
738
613 my $ws = 0; 739 my $x = 0;
614 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 740 my $row_h = $hs->[$r];
615 my $c = ($self->{children}->[$yi] || [])->[$col]; 741
616 if ($c) { 742 for my $c (0 .. $#$row) {
617 my ($w, $h) = $c->size_request; 743 my $col_w = $ws->[$c];
618 if ($ws < $w) { $ws = $w } 744
745 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
748
749 $x += $col_w;
619 } 750 }
751
752 $y += $row_h;
620 } 753 }
621 return $ws; 754
622} 755}
756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
773sub _draw {
774 my ($self) = @_;
775
776 for (grep $_, @{$self->{children}}) {
777 $_->draw for grep $_, @$_;
778 }
779}
780
781#############################################################################
782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
623 788
624sub size_request { 789sub size_request {
625 my ($self) = @_; 790 my ($self) = @_;
626 791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
627 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
628 806
629 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
630 $hs += $self->max_row_height ($yi);
631 }
632 808
633 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
634 my $wm = 0; 810
635 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
636 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
637 } 826 }
638 if ($ws < $wm) { $ws = $wm }
639 } 827 }
640
641 return ($ws, $hs);
642}
643
644sub _draw {
645 my ($self) = @_;
646 828
647 my $y = 0; 829 my $y = 0;
648 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
649 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
650 834
651 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
652
653 my $c = $self->{children}->[$yi]->[$xi];
654 if ($c) {
655 $c->move ($x, $y, 0); #TODO: Move to size_request
656 $c->draw if $c;
657 }
658
659 $x += $self->max_col_width ($xi);
660 }
661
662 $y += $self->max_row_height ($yi);
663 } 836 }
664} 837}
665 838
666############################################################################# 839#############################################################################
667 840
668package CFClient::Widget::VBox; 841package CFClient::UI::VBox;
669 842
843# TODO: wrap into common Box base class
844
670our @ISA = CFClient::Widget::Container::; 845our @ISA = CFClient::UI::Container::;
671
672use SDL::OpenGL;
673 846
674sub size_request { 847sub size_request {
675 my ($self) = @_; 848 my ($self) = @_;
676 849
677 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
681 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
682 ) 855 )
683} 856}
684 857
685sub size_allocate { 858sub size_allocate {
686 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
687 860
688 return unless $self->{w} != $w || $self->{h} != $h; 861 $self->_size_allocate ($x, $y, $w, $h);
689
690 $self->{w} = $w;
691 $self->{h} = $h;
692
693 return unless $self->{h};
694 862
695 my $children = $self->{children}; 863 my $children = $self->{children};
696 864
697 my @h = map +($_->size_request)[1], @$children; 865 my @h = map +($_->size_request)[1], @$children;
698 866
699 my $req_h = List::Util::sum @h; 867 my $req_h = List::Util::sum @h;
700 868
701 if ($req_h > $h) { 869 if ($req_h > $h) {
702 # ah well, not enough space 870 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h; 871 $_ *= $h / $req_h for @h;
704 } else { 872 } else {
705 my @exp = grep $_->{expand}, @$children; 873 my $exp = List::Util::sum map $_->{expand}, @$children;
706 @exp = @$children unless @exp; 874 $exp ||= 1;
707 875
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) { 876 for (0 .. $#$children) {
711 my $child = $children->[$_]; 877 my $child = $children->[$_];
712 878
713 my $alloc_h = $h[$_]; 879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
716 } 880 }
717 } 881 }
718 882
719 my $y = 0; 883 my $y = 0;
720 for (0 .. $#$children) { 884 for (0 .. $#$children) {
721 my $child = $children->[$_]; 885 my $child = $children->[$_];
722 my $h = $h[$_]; 886 my $h = $h[$_];
723 $child->move (0, $y);
724 $child->size_allocate ($w, $h); 887 $child->size_allocate (0, $y, $w, $h);
725 888
726 $y += $h; 889 $y += $h;
727 } 890 }
728} 891}
729 892
730############################################################################# 893#############################################################################
731 894
732package CFClient::Widget::Label; 895package CFClient::UI::Label;
733 896
734our @ISA = CFClient::Widget::; 897our @ISA = CFClient::UI::Base::;
735 898
736use SDL::OpenGL; 899use SDL::OpenGL;
737 900
738sub new { 901sub new {
739 my ($class, %arg) = @_; 902 my ($class, %arg) = @_;
740 903
741 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
742 fg => [1, 1, 1], 905 fg => [1, 1, 1],
743 height => $::FONTSIZE, 906 height => $::FONTSIZE,
744 text => "", 907 text => "",
908 align => -1,
909 padding => 2,
745 layout => new CFClient::Layout, 910 layout => new CFClient::Layout,
746 %arg 911 %arg
747 ); 912 );
748 913
749 $self->set_text ($self->{text}); 914 $self->set_text ($self->{text});
750 915
… …
766 931
767 $self->{text} = $text; 932 $self->{text} = $text;
768 $self->{layout}->set_markup ($text); 933 $self->{layout}->set_markup ($text);
769 934
770 delete $self->{texture}; 935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
771 $self->update; 937 $self->update;
772} 938}
773 939
774sub get_text { 940sub get_text {
775 my ($self, $text) = @_; 941 my ($self, $text) = @_;
… …
780sub size_request { 946sub size_request {
781 my ($self) = @_; 947 my ($self) = @_;
782 948
783 $self->{layout}->set_width; 949 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height}); 950 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size 951 my ($w, $h) = $self->{layout}->size;
786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952
787# ( 953 (
788# $self->{texture}{width}, 954 $w + $self->{padding} * 2,
789# $self->{texture}{height}, 955 $h + $self->{padding} * 2,
790# ) 956 )
791# } else {
792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793#
794# ($w, $h)
795# }
796} 957}
797 958
798sub size_allocate { 959sub size_allocate {
799 my ($self, $w, $h) = @_; 960 my ($self, $x, $y, $w, $h) = @_;
800 961
801 return unless $self->{w} != $w || $self->{h} != $h; 962 $self->_size_allocate ($x, $y, $w, $h) or return;
802 963
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture}; 964 delete $self->{texture};
805} 965}
806 966
807sub update { 967sub update {
808 my ($self) = @_; 968 my ($self) = @_;
… …
814sub _draw { 974sub _draw {
815 my ($self) = @_; 975 my ($self) = @_;
816 976
817 my $tex = $self->{texture} ||= do { 977 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w}); 978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
819 new_from_layout CFClient::Texture $self->{layout}; 980 new_from_layout CFClient::Texture $self->{layout}
820 }; 981 };
821 982
822 glEnable GL_BLEND; 983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
823 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
826 987
827 glColor @{$self->{fg}}; 988 glColor @{$self->{fg}};
828 989
990 my $x =
991 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5;
994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
829 $tex->draw_quad (0, 0); 996 $tex->draw_quad (0, 0);
830 997
998 glDisable GL_TEXTURE_2D;
831 glDisable GL_BLEND; 999 glDisable GL_BLEND;
832 glDisable GL_TEXTURE_2D;
833} 1000}
834 1001
835############################################################################# 1002#############################################################################
836 1003
837package CFClient::Widget::Entry; 1004package CFClient::UI::Entry;
838 1005
839our @ISA = CFClient::Widget::Label::; 1006our @ISA = CFClient::UI::Label::;
840 1007
841use SDL; 1008use SDL;
842use SDL::OpenGL; 1009use SDL::OpenGL;
843 1010
844sub new { 1011sub new {
845 my $class = shift; 1012 my $class = shift;
846 1013
847 $class->SUPER::new ( 1014 $class->SUPER::new (
848 fg => [1, 1, 1], 1015 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4], 1016 bg => [0, 0, 0, 0.2],
850 active_bg => [1, 1, 1], 1017 active_bg => [1, 1, 1, 0.5],
851 active_fg => [0, 0, 0], 1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
852 @_ 1021 @_
853 ) 1022 )
854} 1023}
855 1024
856sub _set_text { 1025sub _set_text {
… …
858 1027
859 $self->{last_activity} = $::NOW; 1028 $self->{last_activity} = $::NOW;
860 1029
861 $self->{text} = $text; 1030 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w}); 1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033
1034 $text =~ s/./*/g if $self->{hidden};
1035
863 $self->{layout}->set_markup ($self->escape_text ($text)); 1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
864 1037
865 $text = substr $text, 0, $self->{cursor}; 1038 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text; 1039 utf8::encode $text;
867 1040
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
… …
875 1048
876 ($w + 1, $h) # add 1 for cursor 1049 ($w + 1, $h) # add 1 for cursor
877} 1050}
878 1051
879sub size_allocate { 1052sub size_allocate {
880 my ($self, $w, $h) = @_; 1053 my ($self, $x, $y, $w, $h) = @_;
881 1054
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h); 1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
885 1056
886 $self->_set_text ($self->{text}); 1057 $self->_set_text ($self->{text});
887} 1058}
888 1059
889sub set_text { 1060sub set_text {
… …
910 substr $text, $self->{cursor}, 1, ""; 1081 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) { 1082 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor}; 1083 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) { 1084 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
915 } elsif ($uni) { 1090 } elsif ($uni) {
916 substr $text, $self->{cursor}++, 0, chr $uni; 1091 substr $text, $self->{cursor}++, 0, chr $uni;
917 } 1092 }
918 1093
919 $self->_set_text ($text); 1094 $self->_set_text ($text);
… …
934 $self->SUPER::button_down ($ev, $x, $y); 1109 $self->SUPER::button_down ($ev, $x, $y);
935 1110
936 my $idx = $self->{layout}->xy_to_index ($x, $y); 1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
937 1112
938 # byte-index to char-index 1113 # byte-index to char-index
939 my $text = $self->{layout}; 1114 my $text = $self->{text};
940 utf8::encode $text; 1115 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx; 1116 $self->{cursor} = length substr $text, 0, $idx;
942 1117
943 $self->_set_text ($self->{text}); 1118 $self->_set_text ($self->{text});
944 $self->update; 1119 $self->update;
… …
959 $self->{fg} = $self->{active_fg}; 1134 $self->{fg} = $self->{active_fg};
960 } else { 1135 } else {
961 glColor @{$self->{bg}}; 1136 glColor @{$self->{bg}};
962 } 1137 }
963 1138
1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
964 glBegin GL_QUADS; 1141 glBegin GL_QUADS;
965 glVertex 0 , 0; 1142 glVertex 0 , 0;
966 glVertex 0 , $self->{h}; 1143 glVertex 0 , $self->{h};
967 glVertex $self->{w}, $self->{h}; 1144 glVertex $self->{w}, $self->{h};
968 glVertex $self->{w}, 0; 1145 glVertex $self->{w}, 0;
969 glEnd; 1146 glEnd;
1147 glDisable GL_BLEND;
970 1148
971 $self->SUPER::_draw; 1149 $self->SUPER::_draw;
972 1150
973 #TODO: force update every cursor change :( 1151 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
980 } 1158 }
981} 1159}
982 1160
983############################################################################# 1161#############################################################################
984 1162
985package CFClient::Widget::Slider; 1163package CFClient::UI::Button;
986 1164
987use strict; 1165our @ISA = CFClient::UI::Label::;
988 1166
1167use SDL;
989use SDL::OpenGL; 1168use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991 1169
992our @ISA = CFClient::Widget::DrawBG::; 1170my @tex =
993 1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
994sub size_request { 1172 qw(b1_button_active.png);
995 my ($self) = @_;
996
997 my $w = 20;
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002 1173
1003sub new { 1174sub new {
1004 my $class = shift; 1175 my $class = shift;
1005 1176
1177 $class->SUPER::new (
1178 padding => 4,
1179 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0],
1182 can_hover => 1,
1183 @_
1184 )
1185}
1186
1187sub button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($x >= 0 && $x < $self->{w}
1191 && $y >= 0 && $y < $self->{h}) {
1192 $self->emit ("activate");
1193 }
1194}
1195
1196sub _draw {
1197 my ($self) = @_;
1198
1199 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
1201
1202 glEnable GL_BLEND;
1203 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg};
1208 }
1209
1210 glBindTexture GL_TEXTURE_2D, $tex->{name};
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1212
1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1214
1215 glDisable GL_TEXTURE_2D;
1216 glDisable GL_BLEND;
1217
1218 $self->SUPER::_draw;
1219}
1220
1221#############################################################################
1222
1223package CFClient::UI::CheckBox;
1224
1225our @ISA = CFClient::UI::DrawBG::;
1226
1227use SDL;
1228use SDL::OpenGL;
1229
1230sub new {
1231 my $class = shift;
1232
1233 $class->SUPER::new (
1234 padding => 2,
1235 fg => [1, 1, 1],
1236 active_fg => [1, 1, 0],
1237 state => 0,
1238 can_hover => 1,
1239 @_
1240 )
1241}
1242
1243sub size_request {
1244 my ($self) = @_;
1245
1246 ($self->{padding} * 2 + 6) x 2
1247}
1248
1249sub size_allocate {
1250 my ($self, $x, $y, $w, $h) = @_;
1251
1252 $self->_size_allocate ($x, $y, $w, $h);
1253}
1254
1255sub button_down {
1256 my ($self, $ev, $x, $y) = @_;
1257
1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1260 $self->{state} = !$self->{state};
1261 $self->emit (changed => $self->{state});
1262 }
1263}
1264
1265sub _draw {
1266 my ($self) = @_;
1267
1268 $self->SUPER::_draw;
1269
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275
1276 glBegin GL_LINE_LOOP;
1277 glVertex 0 , 0;
1278 glVertex 0 , $s;
1279 glVertex $s, $s;
1280 glVertex $s, 0;
1281 glEnd;
1282
1283 if ($self->{state}) {
1284 glBegin GL_LINES;
1285 glVertex 0 , 0;
1286 glVertex $s, $s;
1287 glVertex $s, 0;
1288 glVertex 0 , $s;
1289 glEnd;
1290 }
1291}
1292
1293#############################################################################
1294
1295package CFClient::UI::Slider;
1296
1297use strict;
1298
1299use SDL::OpenGL;
1300
1301our @ISA = CFClient::UI::DrawBG::;
1302
1303sub new {
1304 my $class = shift;
1305
1006 # range [value, low, high, page] 1306 # range [value, low, high, page]
1007 1307
1308 # TODO: 0-width page
1309 # TODO: req_w/h are wrong with vertical
1310 # TODO: calculations are off
1008 $class->SUPER::new ( 1311 my $self = $class->SUPER::new (
1009 fg => [1, 1, 1], 1312 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0], 1313 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10], 1314 range => [0, 0, 100, 10],
1315 req_w => 40,
1316 req_h => 13,
1012 vertical => 0, 1317 vertical => 0,
1318 can_hover => 1,
1013 @_ 1319 @_
1014 ) 1320 );
1321
1322 $self
1323}
1324
1325sub size_request {
1326 my ($self) = @_;
1327
1328 my $w = $self->{req_w};
1329 my $h = $self->{req_h};
1330
1331 $self->{vertical} ? ($h, $w) : ($w, $h)
1015} 1332}
1016 1333
1017sub button_down { 1334sub button_down {
1018 my ($self, $ev, $x, $y) = @_; 1335 my ($self, $ev, $x, $y) = @_;
1019 1336
… …
1025 my ($self, $ev, $x, $y) = @_; 1342 my ($self, $ev, $x, $y) = @_;
1026 1343
1027 if ($GRAB == $self) { 1344 if ($GRAB == $self) {
1028 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1345 my ($value, $lo, $hi, $page) = @{$self->{range}};
1029 1346
1347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1348
1030 $x = $x * ($hi - $lo) / $self->{w} + $lo; 1349 $x = $x * ($hi - $lo) / $w + $lo;
1031 $x = $lo if $x < $lo; 1350 $x = $lo if $x < $lo;
1032 $x = $hi - $page if $x > $hi - $page; 1351 $x = $hi - $page if $x > $hi - $page;
1033 $self->{range}[0] = $x; 1352 $self->{range}[0] = $x;
1034 1353
1035 $self->{changed}($x) if $self->{changed}; 1354 $self->emit (changed => $x);
1036 $self->update; 1355 $self->update;
1037 } 1356 }
1038} 1357}
1039 1358
1040sub _draw { 1359sub _draw {
1041 my ($self) = @_; 1360 my ($self) = @_;
1042 1361
1043 $self->SUPER::_draw (); 1362 $self->SUPER::_draw ();
1044
1045 glPushMatrix;
1046 1363
1047 my ($w, $h) = @$self{qw(w h)}; 1364 my ($w, $h) = @$self{qw(w h)};
1048 1365
1049 if ($self->{vertical}) { 1366 if ($self->{vertical}) {
1050 # draw a vertical slider like a rotated horizontal slider 1367 # draw a vertical slider like a rotated horizontal slider
1051 1368
1052 glTranslate 0, $self->{w};
1053 glRotate 90, 0, 0, 1; 1369 glRotate 90, 0, 0, 1;
1370 glTranslate 0, -$self->{w}, 0;
1054 1371
1055 ($w, $h) = ($h, $w); 1372 ($w, $h) = ($h, $w);
1056 } 1373 }
1057 1374
1058 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
… …
1064 $value = int +($value - $lo) * $w / ($hi - $lo); 1381 $value = int +($value - $lo) * $w / ($hi - $lo);
1065 1382
1066 $w -= $page; 1383 $w -= $page;
1067 $page &= ~1; 1384 $page &= ~1;
1068 glTranslate $page * 0.5, 0, 0; 1385 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2;
1069 1387
1070 glColor @$fg; 1388 glColor @$fg;
1071 glBegin GL_LINES; 1389 glBegin GL_LINES;
1072 glVertex 0, 0; glVertex 0, $h; 1390 glVertex 0, 0; glVertex 0, $h;
1073 glVertex $w - 1, 0; glVertex $w - 1, $h; 1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1090 glVertex $knob_a + 1, $h - 1; 1408 glVertex $knob_a + 1, $h - 1;
1091 glVertex $knob_b - 1, $h - 1; 1409 glVertex $knob_b - 1, $h - 1;
1092 glVertex $knob_b - 1, 1; 1410 glVertex $knob_b - 1, 1;
1093 } 1411 }
1094 glEnd; 1412 glEnd;
1095
1096 glPopMatrix;
1097} 1413}
1098 1414
1099############################################################################# 1415#############################################################################
1100 1416
1417package CFClient::UI::TextView;
1418
1419our @ISA = CFClient::UI::HBox::;
1420
1421use SDL::OpenGL;
1422
1423sub new {
1424 my $class = shift;
1425
1426 my $self = $class->SUPER::new (
1427 par => [],
1428 @_,
1429 children => [
1430 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1),
1432 ],
1433 );
1434
1435 $self
1436}
1437
1438sub add_paragraph {
1439 my ($self, $color, $text) = @_;
1440
1441 push @{$self->{par}}, [$color, $text];
1442 my $count = scalar @{$self->{par}};
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1444 $self->{children}[1]->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $par = $self->{par};
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1461
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
1101package CFClient::Widget::MapWidget; 1484package CFClient::UI::MapWidget;
1102 1485
1103use strict; 1486use strict;
1104 1487
1105use List::Util qw(min max); 1488use List::Util qw(min max);
1106 1489
1107use SDL; 1490use SDL;
1108use SDL::OpenGL; 1491use SDL::OpenGL;
1109use SDL::OpenGL::Constants;
1110 1492
1111our @ISA = CFClient::Widget::; 1493our @ISA = CFClient::UI::Base::;
1112 1494
1113sub new { 1495sub new {
1114 my $class = shift; 1496 my $class = shift;
1115 1497
1116 $class->SUPER::new ( 1498 $class->SUPER::new (
1117 z => -1, 1499 z => -1,
1500 can_focus => 1,
1118 list => (glGenLists 1), 1501 list => (glGenLists 1),
1119 @_ 1502 @_
1120 ) 1503 )
1121} 1504}
1122 1505
1123sub key_down { 1506sub key_down {
… …
1127sub key_up { 1510sub key_up {
1128} 1511}
1129 1512
1130sub size_request { 1513sub size_request {
1131 ( 1514 (
1132 1 + int $::WIDTH / 32, 1515 1 + 32 * int $::WIDTH / 32,
1133 1 + int $::HEIGHT / 32, 1516 1 + 32 * int $::HEIGHT / 32,
1134 ) 1517 )
1135} 1518}
1136 1519
1137sub update { 1520sub update {
1138 my ($self) = @_; 1521 my ($self) = @_;
1139 1522
1140 $self->{need_update} = 1; 1523 $self->{need_update} = 1;
1524 $self->SUPER::update;
1141} 1525}
1142 1526
1143sub _draw { 1527sub draw {
1144 my ($self) = @_; 1528 my ($self) = @_;
1145 1529
1530 $self->{need_update}++;#d#
1146 if (delete $self->{need_update}) { 1531 if (delete $self->{need_update}) {
1147 glNewList $self->{list}, GL_COMPILE; 1532 glNewList $self->{list}, GL_COMPILE;
1148 1533
1149 my $mx = $::CONN->{mapx};
1150 my $my = $::CONN->{mapy};
1151
1152 my $map = $::CONN->{map};
1153
1154 my ($xofs, $yofs);
1155
1156 my $sw = 1 + int $::WIDTH / 32; 1534 my $sw = int $::WIDTH / 32;
1157 my $sh = 1 + int $::HEIGHT / 32; 1535 my $sh = int $::HEIGHT / 32;
1158 1536
1159 if ($::CONN->{mapw} > $sw) { 1537 if ($::MAP) {
1160 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1161 } else {
1162 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1163 }
1164 1539
1165 if ($::CONN->{maph} > $sh) { 1540 if ($::CFG->{fow_enable}) {
1166 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
1167 } else { 1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1168 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1543 glConvolutionFilter2D
1169 } 1544 GL_CONVOLUTION_2D,
1170 1545 GL_ALPHA,
1171 glEnable GL_TEXTURE_2D; 1546 3, 3,
1172 glEnable GL_BLEND; 1547 GL_ALPHA, GL_FLOAT,
1173 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1548 pack "f*",
1174 1549 0.1, 0.1, 0.1,
1175 my $sw4 = ($sw + 3) & ~3; 1550 0.1, 0.2, 0.1,
1176 my $darkness = "\x00" x ($sw4 * $sh); 1551 0.1, 0.1, 0.1,
1177
1178 for my $x (0 .. $sw - 1) {
1179 my $row = $map->[$x + $xofs];
1180 for my $y (0 .. $sh - 1) {
1181
1182 my $cell = $row->[$y + $yofs]
1183 or next; 1552 ;
1184 1553 glEnable GL_CONVOLUTION_2D;
1185 my $dark = $cell->[0];
1186 if ($dark < 0) {
1187 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188 } else {
1189 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1190 } 1554 }
1191 1555
1192 for my $num (grep $_, @$cell[1,2,3]) { 1556 my $tex = new CFClient::Texture
1193 my $tex = $::CONN->{face}[$num]{texture} || next; 1557 w => $w,
1194 1558 h => $h,
1195 my $w = $tex->{width}; 1559 data => $data,
1196 my $h = $tex->{height}; 1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
1197 1562
1198 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1199 } 1564
1565 glEnable GL_BLEND;
1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568
1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1571
1572 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND;
1200 } 1574 }
1201 } 1575 }
1202 1576
1203# if (1) { # higher quality darkness
1204# $lighting =~ s/(.)/$1$1$1/gs;
1205# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1206#
1207# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1208#
1209# $lighting = $pb->get_pixels;
1210# $lighting =~ s/(.)../$1/gs;
1211# }
1212
1213 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215
1216 $darkness = new CFClient::Texture
1217 width => $sw4,
1218 height => $sh,
1219 data => $darkness,
1220 internalformat => GL_ALPHA,
1221 format => GL_ALPHA;
1222
1223 glColor 0.45, 0.45, 0.45, 1;
1224 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1225
1226 glDisable GL_TEXTURE_2D;
1227 glDisable GL_BLEND;
1228
1229 glEndList; 1577 glEndList;
1230 } 1578 }
1231 1579
1232 glCallList $self->{list}; 1580 glCallList $self->{list};
1581
1582 if ($FOCUS != $self) {
1583 glColor 64/255, 64/255, 64/255;
1584 glLogicOp GL_AND;
1585 glEnable GL_COLOR_LOGIC_OP;
1586 glBegin GL_QUADS;
1587 glVertex 0, 0;
1588 glVertex 0, $::HEIGHT;
1589 glVertex $::WIDTH, $::HEIGHT;
1590 glVertex $::WIDTH, 0;
1591 glEnd;
1592 glDisable GL_COLOR_LOGIC_OP;
1593 }
1233} 1594}
1234 1595
1235my %DIR = ( 1596my %DIR = (
1236 SDLK_KP8, [1, "north"], 1597 SDLK_KP8, [1, "north"],
1237 SDLK_KP9, [2, "northeast"], 1598 SDLK_KP9, [2, "northeast"],
… …
1253 1614
1254 my $mod = $ev->key_mod; 1615 my $mod = $ev->key_mod;
1255 my $sym = $ev->key_sym; 1616 my $sym = $ev->key_sym;
1256 1617
1257 if ($sym == SDLK_KP5) { 1618 if ($sym == SDLK_KP5) {
1258 $::CONN->send ("command stay fire"); 1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
1259 } elsif (exists $DIR{$sym}) { 1622 } elsif (exists $DIR{$sym}) {
1260 if ($mod & KMOD_SHIFT) { 1623 if ($mod & KMOD_SHIFT) {
1261 $self->{shft}++; 1624 $self->{shft}++;
1262 $::CONN->send ("command fire $DIR{$sym}[0]"); 1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1263 } elsif ($mod & KMOD_CTRL) { 1626 } elsif ($mod & KMOD_CTRL) {
1264 $self->{ctrl}++; 1627 $self->{ctrl}++;
1265 $::CONN->send ("command run $DIR{$sym}[0]"); 1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
1266 } else { 1629 } else {
1267 $::CONN->send ("command $DIR{$sym}[1]"); 1630 $::CONN->user_send ("command $DIR{$sym}[1]");
1268 } 1631 }
1269 } 1632 }
1270} 1633}
1271 1634
1272sub key_up { 1635sub key_up {
… …
1274 1637
1275 my $mod = $ev->key_mod; 1638 my $mod = $ev->key_mod;
1276 my $sym = $ev->key_sym; 1639 my $sym = $ev->key_sym;
1277 1640
1278 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1279 $::CONN->send ("command fire_stop"); 1642 $::CONN->user_send ("command fire_stop");
1280 } 1643 }
1281 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1282 $::CONN->send ("command run_stop"); 1645 $::CONN->user_send ("command run_stop");
1283 } 1646 }
1284} 1647}
1285 1648
1286############################################################################# 1649#############################################################################
1287 1650
1288package CFClient::Widget::Animator; 1651package CFClient::UI::Animator;
1289 1652
1290use SDL::OpenGL; 1653use SDL::OpenGL;
1291 1654
1292our @ISA = CFClient::Widget::Bin::; 1655our @ISA = CFClient::UI::Bin::;
1293 1656
1294sub moveto { 1657sub moveto {
1295 my ($self, $x, $y) = @_; 1658 my ($self, $x, $y) = @_;
1296 1659
1297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1660 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1325 glPopMatrix; 1688 glPopMatrix;
1326} 1689}
1327 1690
1328############################################################################# 1691#############################################################################
1329 1692
1693package CFClient::UI::Flopper;
1694
1695our @ISA = CFClient::UI::Button::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 my $self = $class->SUPER::new (
1701 state => 0,
1702 connect_activate => \&toggle_flopper,
1703 @_
1704 );
1705
1706 if ($self->{state}) {
1707 $self->{state} = 0;
1708 $self->toggle_flopper;
1709 }
1710
1711 $self
1712}
1713
1714sub toggle_flopper {
1715 my ($self) = @_;
1716
1717 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other});
1720 $self->{other}->move (
1721 ($::WIDTH - $self->{other}{w}) * 0.5,
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1726 }
1727}
1728
1729#############################################################################
1730
1330package CFClient::Widget::Toplevel; 1731package CFClient::UI::Toplevel;
1331 1732
1332our @ISA = CFClient::Widget::Container::; 1733our @ISA = CFClient::UI::Container::;
1333 1734
1334sub size_request { 1735sub size_request {
1335 ($::WIDTH, $::HEIGHT) 1736 ($::WIDTH, $::HEIGHT)
1336} 1737}
1337 1738
1338sub size_allocate { 1739sub size_allocate {
1339 my ($self, $w, $h) = @_; 1740 my ($self, $x, $y, $w, $h) = @_;
1340 1741
1341 $self->SUPER::size_allocate ($w, $h); 1742 $self->_size_allocate ($x, $y, $w, $h);
1342 1743
1343 $_->size_allocate ($_->size_request) 1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1344 for @{$self->{children}}; 1745 for @{$self->{children}};
1345} 1746}
1346 1747
1347sub translate { 1748sub translate {
1348 my ($self, $x, $y) = @_; 1749 my ($self, $x, $y) = @_;
… …
1351} 1752}
1352 1753
1353sub update { 1754sub update {
1354 my ($self) = @_; 1755 my ($self) = @_;
1355 1756
1356 $self->size_allocate ($self->size_request); 1757 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1357 ::refresh (); 1758 ::refresh ();
1358} 1759}
1359 1760
1360sub add { 1761sub add {
1361 my ($self, $widget) = @_; 1762 my ($self, $widget) = @_;
1362 1763
1363 $self->SUPER::add ($widget); 1764 $self->SUPER::add ($widget);
1364 1765
1365 $widget->size_allocate ($widget->size_request); 1766 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1366} 1767}
1367 1768
1368sub draw { 1769sub draw {
1369 my ($self) = @_; 1770 my ($self) = @_;
1370 1771
1371 $self->_draw; 1772 $self->_draw;
1372} 1773}
1373 1774
1374############################################################################# 1775#############################################################################
1375 1776
1376package CFClient::Widget; 1777package CFClient::UI;
1377 1778
1378$TOPLEVEL = new CFClient::Widget::Toplevel; 1779$TOPLEVEL = new CFClient::UI::Toplevel;
1379 1780
13801 17811
1381 1782

Diff Legend

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