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.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.137 by root, Wed Apr 19 21:38:05 2006 UTC

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

Diff Legend

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