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.88 by root, Wed Apr 12 21:01:46 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
12our $TOPLEVEL; 14our $ROOT;
15our $TOOLTIP;
13our $BUTTON_STATE; 16our $BUTTON_STATE;
17
18our %WIDGET; # all widgets, weak-referenced
19
20sub check_tooltip {
21 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) {
26 $TOOLTIP->{owner} = $widget;
27
28 my $tip = $widget->{tooltip};
29
30 $tip = $tip->($widget) if CODE:: eq ref $tip;
31
32 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 }
44
45 return;
46 }
47 }
48 }
49
50 $TOOLTIP->hide;
51 delete $TOOLTIP->{owner};
52}
14 53
15# class methods for events 54# class methods for events
16sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 56 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS;
18} 58}
19 59
20sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 61 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS;
22} 63}
23 64
24sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
25 my ($ev) = @_; 66 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 67 my ($x, $y) = ($ev->{x}, $ev->{y});
27 68
28 if (!$BUTTON_STATE) { 69 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 70 my $widget = $ROOT->find_widget ($x, $y);
30 71
31 $GRAB = $widget; 72 $GRAB = $widget;
32 $GRAB->update if $GRAB; 73 $GRAB->update if $GRAB;
33 }
34 74
75 check_tooltip;
76 }
77
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 79
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 if $GRAB;
38} 82}
39 83
40sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
41 my ($ev) = @_; 85 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
43 87
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 89
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 91
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 if $GRAB;
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 106 my ($x, $y) = ($ev->{x}, $ev->{y});
60 107
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 108 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 109
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER;
121}
122
123# convert position array to integers
124sub harmonize {
125 my ($vals) = @_;
126
127 my $rem = 0;
128
129 for (@$vals) {
130 my $i = int $_ + $rem;
131 $rem += $_ - $i;
132 $_ = $i;
133 }
134}
135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
152# call when resolution changes etc.
153sub rescale_widgets {
154 my ($sx, $sy) = @_;
155
156 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167 }
168
169 reconfigure_widgets;
71} 170}
72 171
73############################################################################# 172#############################################################################
74 173
75package CFClient::UI::Base; 174package CFClient::UI::Base;
76 175
77use strict; 176use strict;
78 177
79use SDL::OpenGL; 178use CFClient::OpenGL;
80 179
81sub new { 180sub new {
82 my $class = shift; 181 my $class = shift;
83 182
84 my $self = bless { 183 my $self = bless {
85 x => 0, 184 x => 0,
86 y => 0, 185 y => 0,
87 z => 0, 186 z => 0,
88 w => -1, 187 can_events => 1,
89 h => -1,
90 @_ 188 @_
91 }, $class; 189 }, $class;
92 190
93 for (keys %$self) { 191 for (keys %$self) {
94 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
96 } 194 }
97 } 195 }
98 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
99 $self 199 $self
200}
201
202sub destroy {
203 my ($self) = @_;
204
205 $self->hide;
206 %$self = ();
207}
208
209sub show {
210 my ($self) = @_;
211 return if $self->{parent};
212
213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{visible};
235
236 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self;
238
239 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self;
241
242 $self->focus_out;
243}
244
245sub hide {
246 my ($self) = @_;
247
248 $self->set_invisible;
249
250 $self->{parent}->remove ($self)
251 if $self->{parent};
100} 252}
101 253
102sub move { 254sub move {
103 my ($self, $x, $y, $z) = @_; 255 my ($self, $x, $y, $z) = @_;
256
104 $self->{x} = $x; 257 $self->{x} = int $x;
105 $self->{y} = $y; 258 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 259 $self->{z} = $z if defined $z;
107}
108 260
109sub needs_redraw { 261 $self->update;
110 0 262}
263
264sub set_size {
265 my ($self, $w, $h) = @_;
266
267 $self->{user_w} = $w;
268 $self->{user_h} = $h;
269
270 $self->check_size;
111} 271}
112 272
113sub size_request { 273sub size_request {
114 require Carp; 274 require Carp;
115 Carp::confess "size_request is abtract"; 275 Carp::confess "size_request is abstract";
116} 276}
117 277
118sub _size_allocate { 278sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 279 my ($self, $x, $y, $w, $h) = @_;
120 280
281 if ($self->{aspect}) {
282 my $w2 = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect};
284
285 # use alignment to adjust x, y
286
287 $x += int +($w - $w2) * 0.5;
288 $y += int +($h - $h2) * 0.5;
289
290 ($w, $h) = ($w2, $h2);
291 }
292
293 if ($self->{x} != $x || $self->{y} != $y) {
121 $self->{x} = $x; 294 $self->{x} = $x;
122 $self->{y} = $y; 295 $self->{y} = $y;
296 $self->update;
297 }
123 298
124 return unless $self->{w} != $w || $self->{h} != $h; 299 if ($self->{w} != $w || $self->{h} != $h) {
125 300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
126 $self->{w} = $w;
127 $self->{h} = $h;
128
129 1 301 }
130} 302}
131 303
132sub size_allocate { 304sub size_allocate {
305 # nothing to be done
306}
307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
315sub children {
316}
317
318sub set_max_size {
133 my ($self, $x, $y, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
134 320
135 $self->_size_allocate ($x, $y, $w, $h); 321 delete $self->{max_w}; $self->{max_w} = $w if $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h;
323}
324
325sub set_tooltip {
326 my ($self, $tooltip) = @_;
327
328 $tooltip =~ s/^\s+//;
329 $tooltip =~ s/\s+$//;
330
331 return if $self->{tooltip} eq $tooltip;
332
333 $self->{tooltip} = $tooltip;
334
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip;
338 }
136} 339}
137 340
138# translate global coordinates to local coordinate system 341# translate global coordinates to local coordinate system
139sub translate { 342sub coord2local {
140 my ($self, $x, $y) = @_; 343 my ($self, $x, $y) = @_;
141 344
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 345 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
346}
347
348# translate local coordinates to global coordinate system
349sub coord2global {
350 my ($self, $x, $y) = @_;
351
352 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
143} 353}
144 354
145sub focus_in { 355sub focus_in {
146 my ($self) = @_; 356 my ($self) = @_;
147 357
148 return if $FOCUS == $self; 358 return if $FOCUS == $self;
359 return unless $self->{can_focus};
149 360
150 my $focus = $FOCUS; $FOCUS = $self; 361 my $focus = $FOCUS; $FOCUS = $self;
362
363 $self->_emit (focus_in => $focus);
364
151 $focus->update if $focus; 365 $focus->update if $focus;
152 $FOCUS->update; 366 $FOCUS->update;
153} 367}
154 368
155sub focus_out { 369sub focus_out {
156 my ($self) = @_; 370 my ($self) = @_;
157 371
158 return unless $FOCUS == $self; 372 return unless $FOCUS == $self;
159 373
160 my $focus = $FOCUS; undef $FOCUS; 374 my $focus = $FOCUS; undef $FOCUS;
375
376 $self->_emit (focus_out => $focus);
377
161 $focus->update if $focus; #? 378 $focus->update if $focus; #?
379
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS;
162} 382}
163 383
164sub mouse_motion { } 384sub mouse_motion { }
165sub button_up { } 385sub button_up { }
166sub key_down { } 386sub key_down { }
167sub key_up { } 387sub key_up { }
168 388
169sub button_down { 389sub button_down {
170 my ($self, $ev, $x, $y) = @_; 390 my ($self, $ev, $x, $y) = @_;
171 391
172 $self->focus_in; 392 $self->focus_in;
… …
186 glPushMatrix; 406 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 407 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 408 $self->_draw;
189 glPopMatrix; 409 glPopMatrix;
190 410
191 if ($self == $HOVER) { 411 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 412 my ($x, $y) = @$self{qw(x y)};
193 413
194 glColor 0, 0, 1, 0.2; 414 glColor 1, 0.8, 0.5, 0.2;
195 glEnable GL_BLEND; 415 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS; 417 glBegin GL_QUADS;
198 glVertex $x , $y; 418 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y; 419 glVertex $x + $self->{w}, $y;
200 glVertex $x + $self->{w}, $y + $self->{h}; 420 glVertex $x + $self->{w}, $y + $self->{h};
201 glVertex $x , $y + $self->{h}; 421 glVertex $x , $y + $self->{h};
202 glEnd; 422 glEnd;
203 glDisable GL_BLEND; 423 glDisable GL_BLEND;
204 } 424 }
425
426 if ($ENV{PCLIENT_DEBUG}) {
427 glPushMatrix;
428 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1;
435 glEnd;
436 glPopMatrix;
437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
438 }
205} 439}
206 440
207sub _draw { 441sub _draw {
208 my ($self) = @_; 442 my ($self) = @_;
209 443
210 warn "no draw defined for $self\n"; 444 warn "no draw defined for $self\n";
211} 445}
212 446
213sub find_widget { 447sub find_widget {
214 my ($self, $x, $y) = @_; 448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
215 451
216 return $self 452 return $self
217 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
218 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
219 455
220 () 456 ()
221} 457}
222 458
223sub set_parent { 459sub set_parent {
224 my ($self, $par) = @_; 460 my ($self, $parent) = @_;
225 461
226 $self->{parent} = $par;
227 Scalar::Util::weaken $self->{parent}; 462 Scalar::Util::weaken ($self->{parent} = $parent);
228}
229 463
230sub get_parent { 464 $self->{root} = $parent->{root};
231 $_[0]->{parent} 465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
232} 479}
233 480
234sub update { 481sub update {
235 my ($self) = @_; 482 my ($self) = @_;
236 483
… …
239} 486}
240 487
241sub connect { 488sub connect {
242 my ($self, $signal, $cb) = @_; 489 my ($self, $signal, $cb) = @_;
243 490
244 push @{ $self->{cb}{$signal} }, $cb; 491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
245} 498}
246 499
247sub emit { 500sub emit {
248 my ($self, $signal, @args) = @_; 501 my ($self, $signal, @args) = @_;
249 502
250 $_->($self, @args) 503 $self->_emit ($signal, @args)
251 for @{$self->{cb}{$signal} || []}; 504 || $self->$signal (@args);
252} 505}
253 506
254sub DESTROY { 507sub DESTROY {
255 my ($self) = @_; 508 my ($self) = @_;
256 509
510 delete $WIDGET{$self+0};
257 #$self->deactivate; 511 #$self->deactivate;
258} 512}
259 513
260############################################################################# 514#############################################################################
261 515
262package CFClient::UI::DrawBG; 516package CFClient::UI::DrawBG;
263 517
264our @ISA = CFClient::UI::Base::; 518our @ISA = CFClient::UI::Base::;
265 519
266use strict; 520use strict;
267use SDL::OpenGL; 521use CFClient::OpenGL;
268 522
269sub new { 523sub new {
270 my $class = shift; 524 my $class = shift;
271 525
272 # range [value, low, high, page] 526 # range [value, low, high, page]
273 527
274 $class->SUPER::new ( 528 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2], 529 #bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5], 530 #active_bg => [1, 1, 1, 0.5],
277 @_ 531 @_
278 ) 532 )
279} 533}
280 534
281sub _draw { 535sub _draw {
282 my ($self) = @_; 536 my ($self) = @_;
283 537
538 my $color = $FOCUS == $self && $self->{active_bg}
539 ? $self->{active_bg}
540 : $self->{bg};
541
542 if ($color && (@$color < 4 || $color->[3])) {
284 my ($w, $h) = @$self{qw(w h)}; 543 my ($w, $h) = @$self{qw(w h)};
285 544
286 glEnable GL_BLEND; 545 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 547 glColor @$color;
289 548
290 glBegin GL_QUADS; 549 glBegin GL_QUADS;
291 glVertex 0 , 0; 550 glVertex 0 , 0;
292 glVertex 0 , $h; 551 glVertex 0 , $h;
293 glVertex $w, $h; 552 glVertex $w, $h;
294 glVertex $w, 0; 553 glVertex $w, 0;
295 glEnd; 554 glEnd;
296 555
297 glDisable GL_BLEND; 556 glDisable GL_BLEND;
557 }
298} 558}
299 559
300############################################################################# 560#############################################################################
301 561
302package CFClient::UI::Empty; 562package CFClient::UI::Empty;
303 563
304our @ISA = CFClient::UI::Base::; 564our @ISA = CFClient::UI::Base::;
565
566sub new {
567 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg);
569}
305 570
306sub size_request { 571sub size_request {
307 (0, 0) 572 (0, 0)
308} 573}
309 574
… …
318sub new { 583sub new {
319 my ($class, %arg) = @_; 584 my ($class, %arg) = @_;
320 585
321 my $children = delete $arg{children} || []; 586 my $children = delete $arg{children} || [];
322 587
323 my $self = $class->SUPER::new (children => [], %arg); 588 my $self = $class->SUPER::new (
589 children => [],
590 can_events => 0,
591 %arg,
592 );
324 $self->add ($_) for @$children; 593 $self->add ($_) for @$children;
325 594
326 $self 595 $self
327} 596}
328 597
329sub add { 598sub add {
330 my ($self, $chld) = @_; 599 my ($self, @widgets) = @_;
331 600
332 $chld->set_parent ($self); 601 $_->set_parent ($self)
602 for @widgets;
603
604 use sort 'stable';
333 605
334 $self->{children} = [ 606 $self->{children} = [
335 sort { $a->{z} <=> $b->{z} } 607 sort { $a->{z} <=> $b->{z} }
336 @{$self->{children}}, $chld 608 @{$self->{children}}, @widgets
337 ]; 609 ];
338 610
339 $self->{w} = $self->{h} = -1; 611 $self->check_size (1);
340 $self->update; 612 $self->update;
341} 613}
342 614
615sub children {
616 @{ $_[0]{children} }
617}
618
343sub remove { 619sub remove {
344 my ($self, $widget) = @_; 620 my ($self, $child) = @_;
345 621
622 delete $child->{parent};
623 $child->hide;
624
346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
347 626
348 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 627 $self->check_size (1);
628 $self->update;
629}
630
631sub clear {
632 my ($self) = @_;
633
634 my $children = delete $self->{children};
635 $self->{children} = [];
636
637 for (@$children) {
638 delete $_->{parent};
639 $_->hide;
640 }
641
642 $self->check_size;
643 $self->update;
349} 644}
350 645
351sub find_widget { 646sub find_widget {
352 my ($self, $x, $y) = @_; 647 my ($self, $x, $y) = @_;
353 648
… …
383 678
384 $class->SUPER::new (children => [$child], %arg) 679 $class->SUPER::new (children => [$child], %arg)
385} 680}
386 681
387sub add { 682sub add {
388 my ($self, $widget) = @_; 683 my ($self, $child) = @_;
389 684
390 $self->{children} = []; 685 $self->{children} = [];
391 686
392 $self->SUPER::add ($widget); 687 $self->SUPER::add ($child);
393} 688}
394 689
395sub remove { 690sub remove {
396 my ($self, $widget) = @_; 691 my ($self, $widget) = @_;
397 692
… …
406sub size_request { 701sub size_request {
407 $_[0]{children}[0]->size_request 702 $_[0]{children}[0]->size_request
408} 703}
409 704
410sub size_allocate { 705sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_; 706 my ($self, $w, $h) = @_;
412 707
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h); 708 $self->{children}[0]->configure (0, 0, $w, $h);
416} 709}
417 710
418############################################################################# 711#############################################################################
419 712
420package CFClient::UI::Window; 713package CFClient::UI::Window;
421 714
422our @ISA = CFClient::UI::Bin::; 715our @ISA = CFClient::UI::Bin::;
423 716
424use SDL::OpenGL; 717use CFClient::OpenGL;
425 718
426sub new { 719sub new {
427 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
428 721
429 my $self = $class->SUPER::new (%arg); 722 my $self = $class->SUPER::new (%arg);
430} 723}
431 724
432sub update { 725sub update {
433 my ($self) = @_; 726 my ($self) = @_;
434 727
435 # we want to do this delayed... 728 $ROOT->on_post_alloc ($self => sub { $self->render_child });
436 $self->render_chld;
437 $self->SUPER::update; 729 $self->SUPER::update;
438} 730}
439 731
440sub render_chld {
441 my ($self) = @_;
442
443 $self->{texture} =
444 CFClient::Texture->new_from_opengl (
445 $self->{w}, $self->{h}, sub { $self->child->draw }
446 );
447}
448
449sub size_allocate { 732sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 733 my ($self, $w, $h) = @_;
451 734
452 $self->_size_allocate ($x, $y, $w, $h) or return;
453
454 $self->child->size_allocate (0, 0, $w, $h); 735 $self->SUPER::size_allocate ($w, $h);
736 $self->update;
737}
455 738
739sub _render {
740 $_[0]{children}[0]->draw;
741}
742
743sub render_child {
744 my ($self) = @_;
745
746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
747 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT;
749
456 $self->render_chld; 750 $self->_render;
751 };
457} 752}
458 753
459sub _draw { 754sub _draw {
460 my ($self) = @_; 755 my ($self) = @_;
461 756
462 my ($w, $h) = ($self->w, $self->h); 757 my ($w, $h) = ($self->w, $self->h);
463 758
464 my $tex = $self->{texture} 759 my $tex = $self->{texture}
465 or return; 760 or return;
466 761
467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
469 glEnable GL_TEXTURE_2D; 762 glEnable GL_TEXTURE_2D;
470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1;
471 765
472 $tex->draw_quad (0, 0, $w, $h); 766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
473 767
474 glDisable GL_BLEND;
475 glDisable GL_TEXTURE_2D; 768 glDisable GL_TEXTURE_2D;
476} 769}
477 770
478############################################################################# 771#############################################################################
479 772
773package CFClient::UI::ViewPort;
774
775our @ISA = CFClient::UI::Window::;
776
777sub new {
778 my $class = shift;
779
780 $class->SUPER::new (
781 scroll_x => 0,
782 scroll_y => 1,
783 @_,
784 )
785}
786
787sub size_request {
788 my ($self) = @_;
789
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
791
792 @$self{qw(child_w child_h)}
793}
794
795sub size_allocate {
796 my ($self, $w, $h) = @_;
797
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800
801 $self->child->configure (0, 0, $w, $h);
802 $self->update;
803}
804
805sub set_offset {
806 my ($self, $x, $y) = @_;
807
808 $self->{view_x} = int $x;
809 $self->{view_y} = int $y;
810
811 $self->update;
812}
813
814# hmm, this does not work for topleft of $self... but we should not ask for that
815sub coord2local {
816 my ($self, $x, $y) = @_;
817
818 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
819}
820
821sub coord2global {
822 my ($self, $x, $y) = @_;
823
824 $x = List::Util::min $self->{w}, $x - $self->{view_x};
825 $y = List::Util::min $self->{h}, $y - $self->{view_y};
826
827 $self->SUPER::coord2global ($x, $y)
828}
829
830sub find_widget {
831 my ($self, $x, $y) = @_;
832
833 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
834 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
835 ) {
836 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
837 } else {
838 $self->CFClient::UI::Base::find_widget ($x, $y)
839 }
840}
841
842sub _render {
843 my ($self) = @_;
844
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846
847 $self->SUPER::_render;
848}
849
850#############################################################################
851
852package CFClient::UI::ScrolledWindow;
853
854our @ISA = CFClient::UI::HBox::;
855
856sub new {
857 my $class = shift;
858
859 my $self;
860
861 my $slider = new CFClient::UI::Slider
862 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]);
866 },
867 ;
868
869 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider,
872 @_,
873 );
874
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider});
878
879 $self
880}
881
882sub update {
883 my ($self) = @_;
884
885 $self->SUPER::update;
886
887 # todo: overwrite size_allocate of child
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890}
891
892sub size_allocate {
893 my ($self, $w, $h) = @_;
894
895 $self->SUPER::size_allocate ($w, $h);
896
897 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
899}
900
901#TODO# update range on size_allocate depending on child
902# update viewport offset on scroll
903
904#############################################################################
905
480package CFClient::UI::Frame; 906package CFClient::UI::Frame;
481 907
482our @ISA = CFClient::UI::Bin::; 908our @ISA = CFClient::UI::Bin::;
483 909
484use SDL::OpenGL; 910use CFClient::OpenGL;
911
912sub new {
913 my $class = shift;
914
915 $class->SUPER::new (
916 bg => undef,
917 @_,
918 )
919}
920
921sub _draw {
922 my ($self) = @_;
923
924 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)};
926
927 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} };
930
931 glBegin GL_QUADS;
932 glVertex 0 , 0;
933 glVertex 0 , $h;
934 glVertex $w, $h;
935 glVertex $w, 0;
936 glEnd;
937
938 glDisable GL_BLEND;
939 }
940
941 $self->SUPER::_draw;
942}
943
944#############################################################################
945
946package CFClient::UI::FancyFrame;
947
948our @ISA = CFClient::UI::Bin::;
949
950use CFClient::OpenGL;
951
952my @tex =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955
956sub new {
957 my $class = shift;
958
959 # TODO: user_x, user_y, overwrite moveto?
960
961 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1],
964 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1,
967 @_
968 );
969
970 $self->{title} &&= new CFClient::UI::Label
971 align => 0,
972 valign => 1,
973 text => $self->{title},
974 fontsize => $self->{border};
975
976 $self
977}
978
979sub border {
980 int $_[0]{border} * $::FONTSIZE
981}
485 982
486sub size_request { 983sub size_request {
487 my ($self) = @_; 984 my ($self) = @_;
488 my $chld = $self->child
489 or return (0, 0);
490 985
491 $chld->move (2, 2); 986 my ($w, $h) = $self->SUPER::size_request;
492 987
493 map { $_ + 4 } $chld->size_request; 988 (
989 $w + $self->border * 2,
990 $h + $self->border * 2,
991 )
494} 992}
495 993
496sub size_allocate { 994sub size_allocate {
497 my ($self, $x, $y, $w, $h) = @_; 995 my ($self, $w, $h) = @_;
498
499 $self->_size_allocate ($x, $y, $w, $h) or return;
500 996
501 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 997 $h -= List::Util::max 0, $self->border * 2;
502} 998 $w -= List::Util::max 0, $self->border * 2;
503 999
504sub _draw { 1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
505 my ($self) = @_; 1001 if $self->{title};
506 1002
507 my $chld = $self->child; 1003 $self->child->configure ($self->border, $self->border, $w, $h);
508
509 my ($w, $h) = $chld->size_request;
510
511 glBegin GL_QUADS;
512 glColor 0, 0, 0;
513 glVertex 0 , 0;
514 glVertex 0 , $h + 4;
515 glVertex $w + 4 , $h + 4;
516 glVertex $w + 4 , 0;
517 glEnd;
518
519 $chld->draw;
520}
521
522#############################################################################
523
524package CFClient::UI::FancyFrame;
525
526our @ISA = CFClient::UI::Bin::;
527
528use SDL::OpenGL;
529
530my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533
534sub size_request {
535 my ($self) = @_;
536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
539 my ($w, $h) = $self->SUPER::size_request;
540
541 $h += $tex[1]->{h};
542 $h += $tex[4]->{h};
543 $w += $tex[2]->{w};
544 $w += $tex[3]->{w};
545
546 ($w, $h)
547}
548
549sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_;
551
552 $self->_size_allocate ($x, $y, $w, $h) or return;
553
554 $h -= $tex[1]{h};
555 $h -= $tex[4]{h};
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558
559 $h = $h < 0 ? 0 : $h;
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565} 1004}
566 1005
567sub button_down { 1006sub button_down {
568 my ($self, $ev, $x, $y) = @_; 1007 my ($self, $ev, $x, $y) = @_;
569 1008
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 1009 my ($w, $h) = @$self{qw(w h)};
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 1010 my $border = $self->border;
572 1011
1012 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
1013 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
1014
1015 if ($lr & $td) {
1016 my ($wx, $wy) = ($self->{x}, $self->{y});
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1017 my ($ox, $oy) = ($ev->{x}, $ev->{y});
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 1018 my ($bw, $bh) = ($self->{w}, $self->{h});
1019
1020 my $mx = $x < $border;
1021 my $my = $y < $border;
575 1022
576 $self->{motion} = sub { 1023 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_; 1024 my ($ev, $x, $y) = @_;
578 1025
579 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1026 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy;
580 1028
581 $self->{user_w} = $bw + $x - $ox; 1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
582 $self->{user_h} = $bh + $y - $oy; 1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
583 $self->update; 1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size;
584 }; 1033 };
585 1034
586 } elsif ($x >= 0 && $x < $self->{w} 1035 } elsif ($lr ^ $td) {
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1036 my ($ox, $oy) = ($ev->{x}, $ev->{y});
590 my ($bx, $by) = ($self->{x}, $self->{y}); 1037 my ($bx, $by) = ($self->{x}, $self->{y});
591 1038
592 $self->{motion} = sub { 1039 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_; 1040 my ($ev, $x, $y) = @_;
594 1041
595 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1042 ($x, $y) = ($ev->{x}, $ev->{y});
596 1043
597 $self->move ($bx + $x - $ox, $by + $y - $oy); 1044 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update; 1045 $self->update;
599 }; 1046 };
600 } 1047 }
… …
613} 1060}
614 1061
615sub _draw { 1062sub _draw {
616 my ($self) = @_; 1063 my ($self) = @_;
617 1064
618 my ($w, $h) = ($self->{w}, $self->{h}); 1065 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 1067
621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 1068 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 1070
626 my $top = $tex[1]; 1071 my $border = $self->border;
627 $top->draw_quad (0, 0, $w, $top->{h});
628 1072
629 my $left = $tex[3]; 1073 glColor @{ $self->{border_bg} };
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
631 1078
632 my $right = $tex[2]; 1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637
638 my $bg = $tex[0]; 1080 my $bg = $tex[0];
639 1081
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 1082 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643 my $rep_x = $cw / $bg->{w}; 1083 my $rep_x = $cw / $bg->{w};
644 my $rep_y = $ch / $bg->{h}; 1084 my $rep_y = $ch / $bg->{h};
645 1085
646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 }
647 1093
648 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
649 glDisable GL_BLEND; 1095
1096 $self->{title}->draw if $self->{title};
650 1097
651 $self->child->draw; 1098 $self->child->draw;
652
653} 1099}
654 1100
655############################################################################# 1101#############################################################################
656 1102
657package CFClient::UI::Table; 1103package CFClient::UI::Table;
658 1104
659our @ISA = CFClient::UI::Base::; 1105our @ISA = CFClient::UI::Base::;
660 1106
661use List::Util qw(max sum); 1107use List::Util qw(max sum);
662 1108
663use SDL::OpenGL; 1109use CFClient::OpenGL;
664 1110
665sub new { 1111sub new {
666 my $class = shift; 1112 my $class = shift;
667 1113
668 $class->SUPER::new ( 1114 $class->SUPER::new (
669 col_expand => [], 1115 col_expand => [],
670 @_ 1116 @_,
671 ) 1117 )
672} 1118}
673 1119
1120sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1122}
1123
674sub add { 1124sub add {
675 my ($self, $x, $y, $chld) = @_; 1125 my ($self, $x, $y, $child) = @_;
676 1126
1127 $child->set_parent ($self);
677 $self->{children}[$y][$x] = $chld; 1128 $self->{children}[$y][$x] = $child;
678 $chld->set_parent ($self);
679 1129
680 $self->{w} = $self->{h} = -1; 1130 $self->check_size (1);
1131}
1132
1133# TODO: move to container class maybe? send children a signal on removal?
1134sub clear {
1135 my ($self) = @_;
1136
1137 my @children = $self->children;
1138 delete $self->{children};
1139
1140 for (@children) {
1141 delete $_->{parent};
1142 $_->hide;
1143 }
1144
1145 $self->check_size (1);
681 $self->update; 1146 $self->update;
682} 1147}
683 1148
684sub get_wh { 1149sub get_wh {
685 my ($self) = @_; 1150 my ($self) = @_;
… …
691 or next; 1156 or next;
692 1157
693 for my $x (0 .. $#$row) { 1158 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x] 1159 my $widget = $row->[$x]
695 or next; 1160 or next;
696 my ($w, $h) = $widget->size_request; 1161 my ($w, $h) = @$widget{qw(req_w req_h)};
697 1162
698 $w[$x] = max $w[$x], $w; 1163 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h; 1164 $h[$y] = max $h[$y], $h;
700 } 1165 }
701 } 1166 }
… …
713 (sum @$hs), 1178 (sum @$hs),
714 ) 1179 )
715} 1180}
716 1181
717sub size_allocate { 1182sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721 1184
722 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
723 1186
724 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
725 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
726 1189
727 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
731 1194
732 # linearly scale sizes 1195 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1196 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1197 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1198
1199 CFClient::UI::harmonize $ws;
1200 CFClient::UI::harmonize $hs;
735 1201
736 my $y; 1202 my $y;
737 1203
738 for my $r (0 .. $#{$self->{children}}) { 1204 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r] 1205 my $row = $self->{children}[$r]
… …
744 1210
745 for my $c (0 .. $#$row) { 1211 for my $c (0 .. $#$row) {
746 my $col_w = $ws->[$c]; 1212 my $col_w = $ws->[$c];
747 1213
748 if (my $widget = $row->[$c]) { 1214 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h); 1215 $widget->configure ($x, $y, $col_w, $row_h);
750 } 1216 }
751 1217
752 $x += $col_w; 1218 $x += $col_w;
753 } 1219 }
754 1220
… …
799 (List::Util::max map $_->[1], @alloc), 1265 (List::Util::max map $_->[1], @alloc),
800 ) 1266 )
801} 1267}
802 1268
803sub size_allocate { 1269sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_; 1270 my ($self, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h);
807 1271
808 ($h, $w) = ($w, $h); 1272 ($h, $w) = ($w, $h);
809 1273
810 my $children = $self->{children}; 1274 my $children = $self->{children};
811 1275
812 my @h = map +($_->size_request)[0], @$children; 1276 my @h = map $_->{req_w}, @$children;
813 1277
814 my $req_h = List::Util::sum @h; 1278 my $req_h = List::Util::sum @h;
815 1279
816 if ($req_h > $h) { 1280 if ($req_h > $h) {
817 # ah well, not enough space 1281 # ah well, not enough space
… …
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h; 1292 $h[$_] = $alloc_h;
829 } 1293 }
830 } 1294 }
831 1295
1296 CFClient::UI::harmonize \@h;
1297
832 my $y = 0; 1298 my $y = 0;
833 for (0 .. $#$children) { 1299 for (0 .. $#$children) {
834 my $child = $children->[$_]; 1300 my $child = $children->[$_];
835 my $h = $h[$_]; 1301 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w); 1302 $child->configure ($y, 0, $h, $w);
837 1303
838 $y += $h; 1304 $y += $h;
839 } 1305 }
1306
1307 1
840} 1308}
841 1309
842############################################################################# 1310#############################################################################
843 1311
844package CFClient::UI::VBox; 1312package CFClient::UI::VBox;
… …
857 (List::Util::sum map $_->[1], @alloc), 1325 (List::Util::sum map $_->[1], @alloc),
858 ) 1326 )
859} 1327}
860 1328
861sub size_allocate { 1329sub size_allocate {
862 my ($self, $x, $y, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
863 1331
864 $self->_size_allocate ($x, $y, $w, $h); 1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
865 1333
866 my $children = $self->{children}; 1334 my $children = $self->{children};
867 1335
868 my @h = map +($_->size_request)[1], @$children; 1336 my @h = map $_->{req_h}, @$children;
869 1337
870 my $req_h = List::Util::sum @h; 1338 my $req_h = List::Util::sum @h;
871 1339
872 if ($req_h > $h) { 1340 if ($req_h > $h) {
873 # ah well, not enough space 1341 # ah well, not enough space
… …
881 1349
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883 } 1351 }
884 } 1352 }
885 1353
1354 CFClient::UI::harmonize \@h;
1355
886 my $y = 0; 1356 my $y = 0;
887 for (0 .. $#$children) { 1357 for (0 .. $#$children) {
888 my $child = $children->[$_]; 1358 my $child = $children->[$_];
889 my $h = $h[$_]; 1359 my $h = $h[$_];
890 $child->size_allocate (0, $y, $w, $h); 1360 $child->configure (0, $y, $w, $h);
891 1361
892 $y += $h; 1362 $y += $h;
893 } 1363 }
1364
1365 1
894} 1366}
895 1367
896############################################################################# 1368#############################################################################
897 1369
898package CFClient::UI::Label; 1370package CFClient::UI::Label;
899 1371
900our @ISA = CFClient::UI::Base::; 1372our @ISA = CFClient::UI::DrawBG::;
901 1373
902use SDL::OpenGL; 1374use CFClient::OpenGL;
903 1375
904sub new { 1376sub new {
905 my ($class, %arg) = @_; 1377 my ($class, %arg) = @_;
906 1378
907 my $self = $class->SUPER::new ( 1379 my $self = $class->SUPER::new (
908 fg => [1, 1, 1], 1380 fg => [1, 1, 1],
909 height => $::FONTSIZE, 1381 #bg => none
910 text => "", 1382 #active_bg => none
911 align => -1, 1383 #font => default_font
912 padding => 2, 1384 #text => initial text
1385 #markup => initial narkup
1386 #max_w => maximum pixel width
1387 ellipsise => 3, # end
913 layout => new CFClient::Layout, 1388 layout => (new CFClient::Layout),
1389 fontsize => 1,
1390 align => -1,
1391 valign => -1,
1392 padding => 2,
1393 can_events => 0,
914 %arg 1394 %arg
915 ); 1395 );
916 1396
1397 if (exists $self->{template}) {
1398 my $layout = new CFClient::Layout;
1399 $layout->set_text (delete $self->{template});
1400 $self->{template} = $layout;
1401 }
1402
1403 if (exists $self->{markup}) {
1404 $self->set_markup (delete $self->{markup});
1405 } else {
917 $self->set_text ($self->{text}); 1406 $self->set_text (delete $self->{text});
1407 }
918 1408
919 $self 1409 $self
920} 1410}
921 1411
922sub escape_text { 1412sub escape($) {
923 local $_ = $_[1]; 1413 local $_ = $_[0];
924 1414
925 s/&/&amp;/g; 1415 s/&/&amp;/g;
926 s/>/&gt;/g; 1416 s/>/&gt;/g;
927 s/</&lt;/g; 1417 s/</&lt;/g;
928 1418
929 $_[1] 1419 $_
1420}
1421
1422sub update {
1423 my ($self) = @_;
1424
1425 delete $self->{texture};
1426 $self->SUPER::update;
930} 1427}
931 1428
932sub set_text { 1429sub set_text {
933 my ($self, $text) = @_; 1430 my ($self, $text) = @_;
934 1431
1432 return if $self->{text} eq "T$text";
935 $self->{text} = $text; 1433 $self->{text} = "T$text";
1434
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
936 $self->{layout}->set_markup ($text); 1436 $self->{layout}->set_text ($text);
937 1437
938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
940 $self->update; 1438 $self->update;
1439 $self->check_size;
941} 1440}
942 1441
943sub get_text { 1442sub set_markup {
944 my ($self, $text) = @_; 1443 my ($self, $markup) = @_;
945 1444
946 $self->{text} 1445 return if $self->{text} eq "M$markup";
1446 $self->{text} = "M$markup";
1447
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup);
1452
1453 $self->update;
1454 $self->check_size;
947} 1455}
948 1456
949sub size_request { 1457sub size_request {
950 my ($self) = @_; 1458 my ($self) = @_;
951 1459
952 $self->{layout}->set_width; 1460 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1);
953 $self->{layout}->set_height ($self->{height}); 1462 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465
954 my ($w, $h) = $self->{layout}->size; 1466 my ($w, $h) = $self->{layout}->size;
1467
1468 if (exists $self->{template}) {
1469 $self->{template}->set_font ($self->{font}) if $self->{font};
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471
1472 my ($w2, $h2) = $self->{template}->size;
1473
1474 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2;
1476 }
955 1477
956 ( 1478 (
957 $w + $self->{padding} * 2, 1479 $w + $self->{padding} * 2,
958 $h + $self->{padding} * 2, 1480 $h + $self->{padding} * 2,
959 ) 1481 )
960} 1482}
961 1483
962sub size_allocate { 1484sub size_allocate {
963 my ($self, $x, $y, $w, $h) = @_; 1485 my ($self, $w, $h) = @_;
964
965 $self->_size_allocate ($x, $y, $w, $h) or return;
966 1486
967 delete $self->{texture}; 1487 delete $self->{texture};
968} 1488}
969 1489
970sub update { 1490sub set_fontsize {
971 my ($self) = @_; 1491 my ($self, $fontsize) = @_;
972 1492
1493 $self->{fontsize} = $fontsize;
973 delete $self->{texture}; 1494 delete $self->{texture};
1495
974 $self->SUPER::update; 1496 $self->update;
1497 $self->check_size;
975} 1498}
976 1499
977sub _draw { 1500sub _draw {
978 my ($self) = @_; 1501 my ($self) = @_;
979 1502
1503 $self->SUPER::_draw; # draw background, if applicable
1504
980 my $tex = $self->{texture} ||= do { 1505 my $tex = $self->{texture} ||= do {
1506 $self->{layout}->set_foreground (@{$self->{fg}});
1507 $self->{layout}->set_font ($self->{font}) if $self->{font};
981 $self->{layout}->set_width ($self->{w}); 1508 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1509 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512
983 new_from_layout CFClient::Texture $self->{layout} 1513 my $tex = new_from_layout CFClient::Texture $self->{layout};
1514
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1517 : ($self->{w} - $tex->{w}) * 0.5);
1518
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1521 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
984 }; 1524 };
985 1525
986 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D; 1526 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990 1528
1529 if ($tex->{format} == GL_ALPHA) {
991 glColor @{$self->{fg}}; 1530 glColor @{$self->{fg}};
992 1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
993 my $x = 1532 } else {
994 $self->{align} < 0 ? $self->{padding} 1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1534 }
996 : ($self->{w} - $tex->{w}) * 0.5;
997
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0);
1000 1535
1001 glDisable GL_TEXTURE_2D; 1536 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003} 1537}
1004 1538
1005############################################################################# 1539#############################################################################
1006 1540
1007package CFClient::UI::Entry; 1541package CFClient::UI::EntryBase;
1008 1542
1009our @ISA = CFClient::UI::Label::; 1543our @ISA = CFClient::UI::Label::;
1010 1544
1011use SDL; 1545use CFClient::OpenGL;
1012use SDL::OpenGL;
1013 1546
1014sub new { 1547sub new {
1015 my $class = shift; 1548 my $class = shift;
1016 1549
1017 $class->SUPER::new ( 1550 $class->SUPER::new (
1018 fg => [1, 1, 1], 1551 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2], 1552 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5], 1553 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0], 1554 active_fg => [0, 0, 0],
1555 can_hover => 1,
1556 can_focus => 1,
1557 valign => 0,
1558 can_events => 1,
1559 #text => ...
1022 @_ 1560 @_
1023 ) 1561 )
1024} 1562}
1025 1563
1026sub _set_text { 1564sub _set_text {
1027 my ($self, $text) = @_; 1565 my ($self, $text) = @_;
1028 1566
1567 delete $self->{cur_h};
1568
1569 return if $self->{text} eq $text;
1570
1571 delete $self->{texture};
1572
1029 $self->{last_activity} = $::NOW; 1573 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text; 1574 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034 1575
1035 $text =~ s/./*/g if $self->{hidden}; 1576 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text ");
1036 1578
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1579 $self->_emit (changed => $self->{text});
1038
1039 $text = substr $text, 0, $self->{cursor};
1040 utf8::encode $text;
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043}
1044
1045sub size_request {
1046 my ($self) = @_;
1047
1048 my ($w, $h) = $self->SUPER::size_request;
1049
1050 ($w + 1, $h) # add 1 for cursor
1051}
1052
1053sub size_allocate {
1054 my ($self, $x, $y, $w, $h) = @_;
1055
1056 $self->SUPER::size_allocate ($x, $y, $w, $h);
1057
1058 $self->_set_text ($self->{text});
1059} 1580}
1060 1581
1061sub set_text { 1582sub set_text {
1062 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1063 1584
1064 $self->{cursor} = length $text; 1585 $self->{cursor} = length $text;
1065 $self->_set_text ($text); 1586 $self->_set_text ($text);
1066 $self->update; 1587 $self->update;
1588 $self->check_size;
1589}
1590
1591sub get_text {
1592 $_[0]{text}
1593}
1594
1595sub size_request {
1596 my ($self) = @_;
1597
1598 my ($w, $h) = $self->SUPER::size_request;
1599
1600 ($w + 1, $h) # add 1 for cursor
1067} 1601}
1068 1602
1069sub key_down { 1603sub key_down {
1070 my ($self, $ev) = @_; 1604 my ($self, $ev) = @_;
1071 1605
1072 my $mod = $ev->key_mod; 1606 my $mod = $ev->{mod};
1073 my $sym = $ev->key_sym; 1607 my $sym = $ev->{sym};
1074
1075 my $uni = $ev->key_unicode; 1608 my $uni = $ev->{unicode};
1076 1609
1077 my $text = $self->get_text; 1610 my $text = $self->get_text;
1078 1611
1079 if ($sym == SDLK_BACKSPACE) { 1612 if ($uni == 8) {
1080 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1613 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1081 } elsif ($sym == SDLK_DELETE) { 1614 } elsif ($uni == 127) {
1082 substr $text, $self->{cursor}, 1, ""; 1615 substr $text, $self->{cursor}, 1, "";
1083 } elsif ($sym == SDLK_LEFT) { 1616 } elsif ($sym == CFClient::SDLK_LEFT) {
1084 --$self->{cursor} if $self->{cursor}; 1617 --$self->{cursor} if $self->{cursor};
1085 } elsif ($sym == SDLK_RIGHT) { 1618 } elsif ($sym == CFClient::SDLK_RIGHT) {
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1619 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) { 1620 } elsif ($sym == CFClient::SDLK_HOME) {
1088 $self->{cursor} = 0; 1621 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) { 1622 } elsif ($sym == CFClient::SDLK_END) {
1090 $self->{cursor} = length $text; 1623 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) {
1625 $self->_emit ('escape');
1091 } elsif ($uni) { 1626 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni; 1627 substr $text, $self->{cursor}++, 0, chr $uni;
1093 } 1628 }
1094 1629
1095 $self->_set_text ($text); 1630 $self->_set_text ($text);
1096 $self->update; 1631 $self->update;
1632 $self->check_size;
1097} 1633}
1098 1634
1099sub focus_in { 1635sub focus_in {
1100 my ($self) = @_; 1636 my ($self) = @_;
1101 1637
… …
1149 1685
1150 $self->SUPER::_draw; 1686 $self->SUPER::_draw;
1151 1687
1152 #TODO: force update every cursor change :( 1688 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1689 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1690
1691 unless (exists $self->{cur_h}) {
1692 my $text = substr $self->{text}, 0, $self->{cursor};
1693 utf8::encode $text;
1694
1695 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1696 }
1697
1154 glColor @{$self->{fg}}; 1698 glColor @{$self->{fg}};
1155 glBegin GL_LINES; 1699 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1700 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1701 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1158 glEnd; 1702 glEnd;
1159 } 1703 }
1160} 1704}
1161 1705
1706package CFClient::UI::Entry;
1707
1708our @ISA = CFClient::UI::EntryBase::;
1709
1710use CFClient::OpenGL;
1711
1712sub key_down {
1713 my ($self, $ev) = @_;
1714
1715 my $sym = $ev->{sym};
1716
1717 if ($sym == 13) {
1718 unshift @{$self->{history}},
1719 my $txt = $self->get_text;
1720 $self->{history_pointer} = -1;
1721 $self->{history_saveback} = '';
1722 $self->_emit (activate => $txt);
1723 $self->update;
1724
1725 } elsif ($sym == CFClient::SDLK_UP) {
1726 if ($self->{history_pointer} < 0) {
1727 $self->{history_saveback} = $self->get_text;
1728 }
1729 if (@{$self->{history} || []} > 0) {
1730 $self->{history_pointer}++;
1731 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1732 $self->{history_pointer} = @{$self->{history} || []} - 1;
1733 }
1734 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1735 }
1736
1737 } elsif ($sym == CFClient::SDLK_DOWN) {
1738 $self->{history_pointer}--;
1739 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1740
1741 if ($self->{history_pointer} >= 0) {
1742 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1743 } else {
1744 $self->set_text ($self->{history_saveback});
1745 }
1746
1747 } else {
1748 $self->SUPER::key_down ($ev);
1749 }
1750
1751}
1752
1162############################################################################# 1753#############################################################################
1163 1754
1164package CFClient::UI::Button; 1755package CFClient::UI::Button;
1165 1756
1166our @ISA = CFClient::UI::Label::; 1757our @ISA = CFClient::UI::Label::;
1167 1758
1168use SDL; 1759use CFClient::OpenGL;
1169use SDL::OpenGL;
1170 1760
1171my @tex = 1761my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1173 qw(b1_button_active.png); 1763 qw(b1_button_active.png);
1174 1764
1175sub new { 1765sub new {
1176 my $class = shift; 1766 my $class = shift;
1177 1767
1178 $class->SUPER::new ( 1768 $class->SUPER::new (
1179 padding => 4, 1769 padding => 4,
1180 fg => [1, 1, 1], 1770 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5], 1771 active_fg => [0, 0, 1],
1184# border_fg => [1, 1, 0], 1772 can_hover => 1,
1773 align => 0,
1774 valign => 0,
1775 can_events => 1,
1185 @_ 1776 @_
1186 ) 1777 )
1187} 1778}
1188 1779
1780sub activate { }
1781
1189sub button_up { 1782sub button_up {
1190 my ($self, $ev, $x, $y) = @_; 1783 my ($self, $ev, $x, $y) = @_;
1191 1784
1785 $self->emit ("activate")
1192 if ($x >= 0 && $x < $self->{w} 1786 if $x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) { 1787 && $y >= 0 && $y < $self->{h};
1194 $self->emit ("activate");
1195 }
1196} 1788}
1197 1789
1198sub _draw { 1790sub _draw {
1199 my ($self) = @_; 1791 my ($self) = @_;
1200 1792
1201 local $self->{fg} = $self->{fg}; 1793 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1203
1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207 1794
1208 if ($GRAB == $self) { 1795 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg}; 1796 $self->{fg} = $self->{active_fg};
1210 } 1797 }
1211 1798
1212 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1799 glEnable GL_TEXTURE_2D;
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1;
1214 1802
1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1803 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1216 1804
1217 glDisable GL_TEXTURE_2D; 1805 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND;
1219 1806
1220 $self->SUPER::_draw; 1807 $self->SUPER::_draw;
1221} 1808}
1222 1809
1223############################################################################# 1810#############################################################################
1224 1811
1225package CFClient::UI::CheckBox; 1812package CFClient::UI::CheckBox;
1226 1813
1227our @ISA = CFClient::UI::DrawBG::; 1814our @ISA = CFClient::UI::DrawBG::;
1228 1815
1229use SDL; 1816my @tex =
1230use SDL::OpenGL; 1817 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1818 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1819
1820use CFClient::OpenGL;
1231 1821
1232sub new { 1822sub new {
1233 my $class = shift; 1823 my $class = shift;
1234 1824
1235 $class->SUPER::new ( 1825 $class->SUPER::new (
1236 padding => 2, 1826 padding => 2,
1237 fg => [1, 1, 1], 1827 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0], 1828 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5],
1239 state => 0, 1831 state => 0,
1832 can_hover => 1,
1240 @_ 1833 @_
1241 ) 1834 )
1242} 1835}
1243 1836
1244sub size_request { 1837sub size_request {
1245 my ($self) = @_; 1838 my ($self) = @_;
1246 1839
1247 ($self->{padding} * 2 + 6) x 2 1840 ($self->{padding} * 2 + 6) x 2
1248}
1249
1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
1252
1253 $self->_size_allocate ($x, $y, $w, $h);
1254} 1841}
1255 1842
1256sub button_down { 1843sub button_down {
1257 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1258 1845
1259 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1260 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1261 $self->{state} = !$self->{state}; 1848 $self->{state} = !$self->{state};
1262 $self->emit (changed => $self->{state}); 1849 $self->_emit (changed => $self->{state});
1263 } 1850 }
1264} 1851}
1265 1852
1266sub _draw { 1853sub _draw {
1267 my ($self) = @_; 1854 my ($self) = @_;
… …
1269 $self->SUPER::_draw; 1856 $self->SUPER::_draw;
1270 1857
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272 1859
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274 1861
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276 1863
1277 glBegin GL_LINE_LOOP; 1864 my $tex = $self->{state} ? $tex[1] : $tex[0];
1278 glVertex 0 , 0;
1279 glVertex 0 , $s;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283 1865
1284 if ($self->{state}) { 1866 glEnable GL_TEXTURE_2D;
1285 glBegin GL_LINES; 1867 $tex->draw_quad_alpha (0, 0, $s, $s);
1286 glVertex 0 , 0; 1868 glDisable GL_TEXTURE_2D;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292} 1869}
1293 1870
1294############################################################################# 1871#############################################################################
1295 1872
1296package CFClient::UI::Slider; 1873package CFClient::UI::Image;
1297 1874
1298use strict;
1299
1300use SDL::OpenGL;
1301
1302our @ISA = CFClient::UI::DrawBG::; 1875our @ISA = CFClient::UI::Base::;
1876
1877use CFClient::OpenGL;
1878use Carp qw/confess/;
1879
1880our %loaded_images;
1303 1881
1304sub new { 1882sub new {
1305 my $class = shift; 1883 my $class = shift;
1306 1884
1885 my $self = $class->SUPER::new (can_events => 0, @_);
1886
1887 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1888
1889 $loaded_images{$self->{image}} ||=
1890 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1891
1892 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1893
1894 Scalar::Util::weaken $loaded_images{$self->{image}};
1895
1896 $self->{aspect} = $tex->{w} / $tex->{h};
1897
1898 $self
1899}
1900
1901sub size_request {
1902 my ($self) = @_;
1903
1904 ($self->{tex}->{w}, $self->{tex}->{h})
1905}
1906
1907sub _draw {
1908 my ($self) = @_;
1909
1910 my $tex = $self->{tex};
1911
1912 my ($w, $h) = ($self->{w}, $self->{h});
1913
1914 if ($self->{rot90}) {
1915 glRotate 90, 0, 0, 1;
1916 glTranslate 0, -$self->{w}, 0;
1917
1918 ($w, $h) = ($h, $w);
1919 }
1920
1921 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923
1924 $tex->draw_quad_alpha (0, 0, $w, $h);
1925
1926 glDisable GL_TEXTURE_2D;
1927}
1928
1929#############################################################################
1930
1931package CFClient::UI::VGauge;
1932
1933our @ISA = CFClient::UI::Base::;
1934
1935use List::Util qw(min max);
1936
1937use CFClient::OpenGL;
1938
1939my %tex = (
1940 food => [
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1942 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1943 ],
1944 grace => [
1945 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1946 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1947 ],
1948 hp => [
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1950 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1951 ],
1952 mana => [
1953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1954 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1955 ],
1956);
1957
1958# eg. VGauge->new (gauge => 'food'), default gauge: food
1959sub new {
1960 my $class = shift;
1961
1962 my $self = $class->SUPER::new (
1963 type => 'food',
1964 @_
1965 );
1966
1967 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1968
1969 $self
1970}
1971
1972sub size_request {
1973 my ($self) = @_;
1974
1975 #my $tex = $tex{$self->{type}}[0];
1976 #@$tex{qw(w h)}
1977 (0, 0)
1978}
1979
1980sub set_max {
1981 my ($self, $max) = @_;
1982
1983 return if $self->{max_val} == $max;
1984
1985 $self->{max_val} = $max;
1986 $self->update;
1987}
1988
1989sub set_value {
1990 my ($self, $val, $max) = @_;
1991
1992 $self->set_max ($max)
1993 if defined $max;
1994
1995 return if $self->{val} == $val;
1996
1997 $self->{val} = $val;
1998 $self->update;
1999}
2000
2001sub _draw {
2002 my ($self) = @_;
2003
2004 my $tex = $tex{$self->{type}};
2005 my ($t1, $t2, $t3) = @$tex;
2006
2007 my ($w, $h) = ($self->{w}, $self->{h});
2008
2009 if ($self->{vertical}) {
2010 glRotate 90, 0, 0, 1;
2011 glTranslate 0, -$self->{w}, 0;
2012
2013 ($w, $h) = ($h, $w);
2014 }
2015
2016 my $ycut = $self->{val} / ($self->{max_val} || 1);
2017
2018 my $ycut1 = max 0, min 1, $ycut;
2019 my $ycut2 = max 0, min 1, $ycut - 1;
2020
2021 my $h1 = $self->{h} * (1 - $ycut1);
2022 my $h2 = $self->{h} * (1 - $ycut2);
2023
2024 glEnable GL_BLEND;
2025 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2026 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028
2029 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS;
2031 glTexCoord 0 , 0; glVertex 0 , 0;
2032 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
2033 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
2034 glTexCoord $t1->{s}, 0; glVertex $w, 0;
2035 glEnd;
2036
2037 my $ycut1 = List::Util::min 1, $ycut;
2038 glBindTexture GL_TEXTURE_2D, $t2->{name};
2039 glBegin GL_QUADS;
2040 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
2041 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
2042 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
2043 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
2044 glEnd;
2045
2046 if ($t3) {
2047 glBindTexture GL_TEXTURE_2D, $t3->{name};
2048 glBegin GL_QUADS;
2049 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2050 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2051 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2052 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2053 glEnd;
2054 }
2055
2056 glDisable GL_BLEND;
2057 glDisable GL_TEXTURE_2D;
2058}
2059
2060#############################################################################
2061
2062package CFClient::UI::Gauge;
2063
2064our @ISA = CFClient::UI::VBox::;
2065
2066sub new {
2067 my ($class, %arg) = @_;
2068
2069 my $self = $class->SUPER::new (
2070 tooltip => $arg{type},
2071 can_hover => 1,
2072 can_events => 1,
2073 %arg,
2074 );
2075
2076 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2077 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2078 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
2079
2080 $self
2081}
2082
2083sub set_fontsize {
2084 my ($self, $fsize) = @_;
2085
2086 $self->{value}->set_fontsize ($fsize);
2087 $self->{max} ->set_fontsize ($fsize);
2088}
2089
2090sub set_max {
2091 my ($self, $max) = @_;
2092
2093 $self->{gauge}->set_max ($max);
2094 $self->{max}->set_text ($max);
2095}
2096
2097sub set_value {
2098 my ($self, $val, $max) = @_;
2099
2100 $self->set_max ($max)
2101 if defined $max;
2102
2103 $self->{gauge}->set_value ($val, $max);
2104 $self->{value}->set_text ($val);
2105}
2106
2107#############################################################################
2108
2109package CFClient::UI::Slider;
2110
2111use strict;
2112
2113use CFClient::OpenGL;
2114
2115our @ISA = CFClient::UI::DrawBG::;
2116
2117my @tex =
2118 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
2119 qw(s1_slider.png s1_slider_bg.png);
2120
2121sub new {
2122 my $class = shift;
2123
1307 # range [value, low, high, page] 2124 # range [value, low, high, page, unit]
1308 2125
2126 # TODO: 0-width page
2127 # TODO: req_w/h are wrong with vertical
2128 # TODO: calculations are off
1309 my $self = $class->SUPER::new ( 2129 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1], 2130 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0], 2131 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5],
1312 range => [0, 0, 100, 10], 2134 range => [0, 0, 100, 10, 0],
1313 req_w => 40, 2135 req_w => $::WIDTH / 80,
1314 req_h => 10, 2136 req_h => $::WIDTH / 80,
1315 vertical => 0, 2137 vertical => 0,
2138 can_hover => 1,
2139 inner_pad => 0.02,
1316 @_ 2140 @_
1317 ); 2141 );
1318 2142
2143 $self->set_value ($self->{range}[0]);
2144 $self->update;
2145
1319 $self 2146 $self
2147}
2148
2149sub set_range {
2150 my ($self, $range) = @_;
2151
2152 ($range, $self->{range}) = ($self->{range}, $range);
2153
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2156}
2157
2158sub set_value {
2159 my ($self, $value) = @_;
2160
2161 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2162
2163 $hi = $lo + 1 if $hi <= $lo;
2164
2165 $page = $hi - $lo if $page > $hi - $lo;
2166
2167 $value = $lo if $value < $lo;
2168 $value = $hi - $page if $value > $hi - $page;
2169
2170 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2171 if $unit;
2172
2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2174
2175 if ($value != $old_value) {
2176 $self->_emit (changed => $value);
2177 $self->update;
2178 }
1320} 2179}
1321 2180
1322sub size_request { 2181sub size_request {
1323 my ($self) = @_; 2182 my ($self) = @_;
1324 2183
… …
1330 2189
1331sub button_down { 2190sub button_down {
1332 my ($self, $ev, $x, $y) = @_; 2191 my ($self, $ev, $x, $y) = @_;
1333 2192
1334 $self->SUPER::button_down ($ev, $x, $y); 2193 $self->SUPER::button_down ($ev, $x, $y);
2194
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196
1335 $self->mouse_motion ($ev, $x, $y); 2197 $self->mouse_motion ($ev, $x, $y);
1336} 2198}
1337 2199
1338sub mouse_motion { 2200sub mouse_motion {
1339 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
1340 2202
1341 if ($GRAB == $self) { 2203 if ($GRAB == $self) {
2204 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2205
2206 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2211 }
2212}
2213
2214sub update {
2215 my ($self) = @_;
2216
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2218 $self->set_value ($self->{range}[0]);
2219
1342 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2220 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100;
1343 2222
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2223 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1345 2224
1346 $x = $x * ($hi - $lo) / $w + $lo; 2225 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1347 $x = $lo if $x < $lo; 2226 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1348 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x;
1350 2227
1351 $self->emit (changed => $x); 2228 $value = ($value - $lo) / $range;
1352 $self->update; 2229 $value = $value * $self->{scale} + $self->{offset};
2230
2231 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w;
1353 } 2233 });
2234
2235 $self->SUPER::update;
1354} 2236}
1355 2237
1356sub _draw { 2238sub _draw {
1357 my ($self) = @_; 2239 my ($self) = @_;
1358 2240
1359 $self->SUPER::_draw (); 2241 $self->SUPER::_draw ();
1360 2242
1361 my ($w, $h) = @$self{qw(w h)}; 2243 glScale $self->{w}, $self->{h};
1362 2244
1363 if ($self->{vertical}) { 2245 if ($self->{vertical}) {
1364 # draw a vertical slider like a rotated horizontal slider 2246 # draw a vertical slider like a rotated horizontal slider
1365 2247
2248 glTranslate 1, 0, 0;
1366 glRotate 90, 0, 0, 1; 2249 glRotate 90, 0, 0, 1;
1367 glTranslate 0, -$self->{w}, 0;
1368
1369 ($w, $h) = ($h, $w);
1370 } 2250 }
1371 2251
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2252 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2253 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374 2254
1375 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2255 glEnable GL_TEXTURE_2D;
2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1376 2257
1377 $page = int $page * $w / ($hi - $lo); 2258 # draw background
1378 $value = int +($value - $lo) * $w / ($hi - $lo); 2259 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1379 2260
1380 $w -= $page; 2261 # draw handle
1381 $page &= ~1; 2262 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1382 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2;
1384 2263
1385 glColor @$fg; 2264 glDisable GL_TEXTURE_2D;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5;
1393 my $knob_b = $value + $page * 0.5;
1394
1395 glBegin GL_QUADS;
1396 glColor @$fg;
1397 glVertex $knob_a, 0;
1398 glVertex $knob_a, $h;
1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401
1402 if ($knob_a < $knob_b - 2) {
1403 glColor @$bg;
1404 glVertex $knob_a + 1, 1;
1405 glVertex $knob_a + 1, $h - 1;
1406 glVertex $knob_b - 1, $h - 1;
1407 glVertex $knob_b - 1, 1;
1408 }
1409 glEnd;
1410} 2265}
1411 2266
1412############################################################################# 2267#############################################################################
1413 2268
1414package CFClient::UI::MapWidget; 2269package CFClient::UI::ValSlider;
1415 2270
1416use strict;
1417
1418use List::Util qw(min max);
1419
1420use SDL;
1421use SDL::OpenGL;
1422
1423our @ISA = CFClient::UI::Base::; 2271our @ISA = CFClient::UI::HBox::;
2272
2273sub new {
2274 my ($class, %arg) = @_;
2275
2276 my $range = delete $arg{range};
2277
2278 my $self = $class->SUPER::new (
2279 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2280 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2281 to_value => sub { shift },
2282 from_value => sub { shift },
2283 %arg,
2284 );
2285
2286 $self->{slider}->connect (changed => sub {
2287 my ($self, $value) = @_;
2288 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2289 $self->{parent}->emit (changed => $value);
2290 });
2291
2292# $self->{entry}->connect (changed => sub {
2293# my ($self, $value) = @_;
2294# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2295# $self->{parent}->emit (changed => $value);
2296# });
2297
2298 $self->add ($self->{slider}, $self->{entry});
2299
2300 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2301
2302 $self
2303}
2304
2305sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) }
2307
2308#############################################################################
2309
2310package CFClient::UI::TextView;
2311
2312our @ISA = CFClient::UI::HBox::;
2313
2314use CFClient::OpenGL;
1424 2315
1425sub new { 2316sub new {
1426 my $class = shift; 2317 my $class = shift;
1427 2318
1428 $class->SUPER::new ( 2319 my $self = $class->SUPER::new (
1429 z => -1, 2320 fontsize => 1,
1430 list => (glGenLists 1), 2321 can_events => 0,
2322 #font => default_font
1431 @_ 2323 @_,
2324
2325 layout => (new CFClient::Layout 1),
2326 par => [],
2327 height => 0,
2328 children => [
2329 (new CFClient::UI::Empty expand => 1),
2330 (new CFClient::UI::Slider vertical => 1),
2331 ],
1432 ) 2332 );
1433}
1434 2333
1435sub key_down { 2334 $self->{children}[1]->connect (changed => sub { $self->update });
1436 print "MAPKEYDOWN\n";
1437}
1438 2335
1439sub key_up { 2336 $self
1440} 2337}
1441 2338
1442sub size_request { 2339sub set_fontsize {
2340 my ($self, $fontsize) = @_;
2341
2342 $self->{fontsize} = $fontsize;
2343 $self->reflow;
2344}
2345
2346sub size_allocate {
2347 my ($self, $w, $h) = @_;
2348
2349 $self->SUPER::size_allocate ($w, $h);
2350
2351 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $self->{layout}->set_width ($self->{children}[0]{w});
2354
2355 $self->reflow;
2356}
2357
2358sub text_size {
2359 my ($self, $text, $indent) = @_;
2360
2361 my $layout = $self->{layout};
2362
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $layout->set_width ($self->{children}[0]{w} - $indent);
2365 $layout->set_markup ($text);
1443 ( 2366
1444 1 + 32 * int $::WIDTH / 32, 2367 $layout->size
1445 1 + 32 * int $::HEIGHT / 32, 2368}
2369
2370sub reflow {
2371 my ($self) = @_;
2372
2373 $self->{need_reflow}++;
2374 $self->update;
2375}
2376
2377sub set_offset {
2378 my ($self, $offset) = @_;
2379
2380 # todo: base offset on lines or so, not on pixels
2381 $self->{children}[1]->set_value ($offset);
2382}
2383
2384sub clear {
2385 my ($self) = @_;
2386
2387 $self->{par} = [];
2388 $self->{height} = 0;
2389 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2390}
2391
2392sub add_paragraph {
2393 my ($self, $color, $text, $indent) = @_;
2394
2395 for my $line (split /\n/, $text) {
2396 my ($w, $h) = $self->text_size ($line);
2397 $self->{height} += $h;
2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
1446 ) 2399 }
2400
2401 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1447} 2402}
1448 2403
1449sub update { 2404sub update {
1450 my ($self) = @_; 2405 my ($self) = @_;
1451 2406
1452 $self->{need_update} = 1;
1453 $self->SUPER::update; 2407 $self->SUPER::update;
1454}
1455 2408
1456sub draw { 2409 return unless $self->{h} > 0;
1457 my ($self) = @_;
1458 2410
2411 delete $self->{texture};
2412
2413 $ROOT->on_post_alloc ($self, sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415
1459 if (delete $self->{need_update}) { 2416 if (delete $self->{need_reflow}) {
1460 glNewList $self->{list}, GL_COMPILE; 2417 my $height = 0;
1461 2418
1462 my $mx = $::CONN->{mapx}; 2419 my $layout = $self->{layout};
1463 my $my = $::CONN->{mapy};
1464 2420
1465 my $map = $::CONN->{map}; 2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1466 2422
1467 my ($xofs, $yofs); 2423 for (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2425 $layout->set_width ($W - $_->[3]);
2426 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3];
2429 $_->[1] = $h;
2430 }
1468 2431
1469 my $sw = 1 + int $::WIDTH / 32; 2432 $height += $_->[1];
1470 my $sh = 1 + int $::HEIGHT / 32; 2433 }
1471 2434
1472 if ($::CONN->{mapw} > $sw) { 2435 $self->{height} = $height;
1473 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 2436
1474 } else { 2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1475 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 2438
2439 delete $self->{texture};
1476 } 2440 }
1477 2441
1478 if ($::CONN->{maph} > $sh) { 2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1479 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 2443 glClearColor 0.5, 0.5, 0.5, 0;
1480 } else { 2444 glClear GL_COLOR_BUFFER_BIT;
1481 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1482 }
1483 2445
1484 glEnable GL_TEXTURE_2D; 2446 my $top = int $self->{children}[1]{range}[0];
2447
2448 my $y0 = $top;
2449 my $y1 = $top + $H;
2450
2451 my $y = 0;
2452
2453 my $layout = $self->{layout};
2454
2455 $layout->set_font ($self->{font}) if $self->{font};
2456
1485 glEnable GL_BLEND; 2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 glColor 1, 1, 1, 1;
1489 2460
1490 my $sw4 = ($sw + 3) & ~3; 2461 for my $par (@{$self->{par}}) {
1491 my $darkness = "\x00" x ($sw4 * $sh); 2462 my $h = $par->[1];
1492 2463
1493 for my $x (0 .. $sw - 1) { 2464 if ($y0 < $y + $h && $y < $y1) {
1494 my $row = $map->[$x + $xofs]; 2465 $layout->set_foreground (@{ $par->[2] });
1495 for my $y (0 .. $sh - 1) { 2466 $layout->set_width ($W - $par->[3]);
2467 $layout->set_markup ($par->[4]);
1496 2468
1497 my $cell = $row->[$y + $yofs] 2469 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1498 or next;
1499 2470
1500 my $dark = $cell->[0]; 2471 glRasterPos $par->[3], $y - $y0;
1501 if ($dark < 0) { 2472 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1502 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503 } else {
1504 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1505 } 2473 }
1506 2474
1507 for my $num (grep $_, @$cell[1,2,3]) { 2475 $y += $h;
1508 my $tex = $::CONN->{face}[$num]{texture} || next;
1509
1510 my ($w, $h) = @$tex{qw(w h)};
1511
1512 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1513 }
1514 } 2476 }
2477
2478 glDisable GL_BLEND;
1515 } 2479 };
2480 });
2481}
1516 2482
1517# if (1) { # higher quality darkness 2483sub _draw {
1518# $lighting =~ s/(.)/$1$1$1/gs; 2484 my ($self) = @_;
1519# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1520#
1521# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1522#
1523# $lighting = $pb->get_pixels;
1524# $lighting =~ s/(.)../$1/gs;
1525# }
1526 2485
2486 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528 2488 glColor 1, 1, 1, 1;
1529 $darkness = new CFClient::Texture 2489 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1530 w => $sw4,
1531 h => $sh,
1532 data => $darkness,
1533 internalformat => GL_ALPHA,
1534 format => GL_ALPHA;
1535
1536 glColor 0.45, 0.45, 0.45, 1;
1537 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1538
1539 glDisable GL_TEXTURE_2D; 2490 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541 2491
1542 glEndList; 2492 $self->{children}[1]->draw;
1543 }
1544 2493
1545 glCallList $self->{list};
1546
1547 if ($FOCUS != $self) {
1548 glEnable GL_BLEND;
1549 glColor 0, 0, 1, 0.4;
1550 glBegin GL_QUADS;
1551 glVertex 0, 0;
1552 glVertex 0, $::HEIGHT;
1553 glVertex $::WIDTH, $::HEIGHT;
1554 glVertex $::WIDTH, 0;
1555 glEnd;
1556 glDisable GL_BLEND;
1557 }
1558}
1559
1560my %DIR = (
1561 SDLK_KP8, [1, "north"],
1562 SDLK_KP9, [2, "northeast"],
1563 SDLK_KP6, [3, "east"],
1564 SDLK_KP3, [4, "southeast"],
1565 SDLK_KP2, [5, "south"],
1566 SDLK_KP1, [6, "southwest"],
1567 SDLK_KP4, [7, "west"],
1568 SDLK_KP7, [8, "northwest"],
1569
1570 SDLK_UP, [1, "north"],
1571 SDLK_RIGHT, [3, "east"],
1572 SDLK_DOWN, [5, "south"],
1573 SDLK_LEFT, [7, "west"],
1574);
1575
1576sub key_down {
1577 my ($self, $ev) = @_;
1578
1579 my $mod = $ev->key_mod;
1580 my $sym = $ev->key_sym;
1581
1582 if ($sym == SDLK_KP5) {
1583 $::CONN->send ("command stay fire");
1584 } elsif ($sym == SDLK_a) {
1585 $::CONN->send ("command apply");
1586 } elsif (exists $DIR{$sym}) {
1587 if ($mod & KMOD_SHIFT) {
1588 $self->{shft}++;
1589 $::CONN->send ("command fire $DIR{$sym}[0]");
1590 } elsif ($mod & KMOD_CTRL) {
1591 $self->{ctrl}++;
1592 $::CONN->send ("command run $DIR{$sym}[0]");
1593 } else {
1594 $::CONN->send ("command $DIR{$sym}[1]");
1595 }
1596 }
1597}
1598
1599sub key_up {
1600 my ($self, $ev) = @_;
1601
1602 my $mod = $ev->key_mod;
1603 my $sym = $ev->key_sym;
1604
1605 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1606 $::CONN->send ("command fire_stop");
1607 }
1608 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1609 $::CONN->send ("command run_stop");
1610 }
1611} 2494}
1612 2495
1613############################################################################# 2496#############################################################################
1614 2497
1615package CFClient::UI::Animator; 2498package CFClient::UI::Animator;
1616 2499
1617use SDL::OpenGL; 2500use CFClient::OpenGL;
1618 2501
1619our @ISA = CFClient::UI::Bin::; 2502our @ISA = CFClient::UI::Bin::;
1620 2503
1621sub moveto { 2504sub moveto {
1622 my ($self, $x, $y) = @_; 2505 my ($self, $x, $y) = @_;
… …
1652 glPopMatrix; 2535 glPopMatrix;
1653} 2536}
1654 2537
1655############################################################################# 2538#############################################################################
1656 2539
1657package CFClient::UI::Toplevel; 2540package CFClient::UI::Flopper;
2541
2542our @ISA = CFClient::UI::Button::;
2543
2544sub new {
2545 my $class = shift;
2546
2547 my $self = $class->SUPER::new (
2548 state => 0,
2549 connect_activate => \&toggle_flopper,
2550 @_
2551 );
2552
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self
2559}
2560
2561sub toggle_flopper {
2562 my ($self) = @_;
2563
2564 # TODO: use animation
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575}
2576
2577#############################################################################
2578
2579package CFClient::UI::Tooltip;
2580
2581our @ISA = CFClient::UI::Bin::;
2582
2583use CFClient::OpenGL;
2584
2585sub new {
2586 my $class = shift;
2587
2588 $class->SUPER::new (
2589 @_,
2590 can_events => 0,
2591 )
2592}
2593
2594sub set_tooltip_from {
2595 my ($self, $widget) = @_;
2596
2597 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip},
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8,
2601 fg => [0, 0, 0, 1],
2602 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP),
2604 );
2605}
2606
2607sub size_request {
2608 my ($self) = @_;
2609
2610 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2611
2612 ($w + 4, $h + 4)
2613}
2614
2615sub size_allocate {
2616 my ($self, $w, $h) = @_;
2617
2618 $self->SUPER::size_allocate ($w - 4, $h - 4);
2619}
2620
2621sub _draw {
2622 my ($self) = @_;
2623
2624 glTranslate 0.375, 0.375;
2625
2626 my ($w, $h) = @$self{qw(w h)};
2627
2628 glColor 1, 0.8, 0.4;
2629 glBegin GL_QUADS;
2630 glVertex 0 , 0;
2631 glVertex 0 , $h;
2632 glVertex $w, $h;
2633 glVertex $w, 0;
2634 glEnd;
2635
2636 glColor 0, 0, 0;
2637 glBegin GL_LINE_LOOP;
2638 glVertex 0 , 0;
2639 glVertex 0 , $h;
2640 glVertex $w, $h;
2641 glVertex $w, 0;
2642 glEnd;
2643
2644 glTranslate 2 - 0.375, 2 - 0.375;
2645 $self->SUPER::_draw;
2646}
2647
2648#############################################################################
2649
2650package CFClient::UI::Face;
2651
2652our @ISA = CFClient::UI::Base::;
2653
2654use CFClient::OpenGL;
2655
2656sub new {
2657 my $class = shift;
2658
2659 my $self = $class->SUPER::new (
2660 aspect => 1,
2661 can_events => 0,
2662 @_,
2663 );
2664
2665 if ($self->{anim} && $self->{animspeed}) {
2666 Scalar::Util::weaken (my $widget = $self);
2667
2668 $self->{timer} = Event->timer (
2669 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2670 hard => 1,
2671 interval => $self->{animspeed},
2672 cb => sub {
2673 ++$widget->{frame};
2674 $widget->update;
2675 },
2676 );
2677 }
2678
2679 $self
2680}
2681
2682sub size_request {
2683 (32, 8)
2684}
2685
2686sub update {
2687 my ($self) = @_;
2688
2689 return unless $self->{visible};
2690
2691 $self->SUPER::update;
2692}
2693
2694sub _draw {
2695 my ($self) = @_;
2696
2697 return unless $::CONN;
2698
2699 my $face;
2700
2701 if ($self->{frame}) {
2702 my $anim = $::CONN->{anim}[$self->{anim}];
2703
2704 $face = $anim->[ $self->{frame} % @$anim ]
2705 if $anim && @$anim;
2706 }
2707
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709
2710 if ($tex) {
2711 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D;
2716 }
2717}
2718
2719sub DESTROY {
2720 my ($self) = @_;
2721
2722 $self->{timer}->cancel
2723 if $self->{timer};
2724
2725 $self->SUPER::DESTROY;
2726}
2727
2728#############################################################################
2729
2730package CFClient::UI::Inventory;
2731
2732our @ISA = CFClient::UI::ScrolledWindow::;
2733
2734sub new {
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774
2775#############################################################################
2776
2777package CFClient::UI::Menu;
2778
2779our @ISA = CFClient::UI::FancyFrame::;
2780
2781use CFClient::OpenGL;
2782
2783sub new {
2784 my $class = shift;
2785
2786 my $self = $class->SUPER::new (
2787 items => [],
2788 z => 100,
2789 @_,
2790 );
2791
2792 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2793
2794 for my $item (@{ $self->{items} }) {
2795 my ($widget, $cb) = @$item;
2796
2797 # handle various types of items, only text for now
2798 if (!ref $widget) {
2799 $widget = new CFClient::UI::Label
2800 can_hover => 1,
2801 can_events => 1,
2802 text => $widget;
2803 }
2804
2805 $self->{item}{$widget} = $item;
2806
2807 $self->{vbox}->add ($widget);
2808 }
2809
2810 $self
2811}
2812
2813# popup given the event (must be a mouse button down event currently)
2814sub popup {
2815 my ($self, $ev) = @_;
2816
2817 $self->_emit ("popdown");
2818
2819 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self;
2821 $self->{button} = $ev->{button};
2822
2823 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825}
2826
2827sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_;
2829
2830 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER};
2833}
2834
2835sub button_up {
2836 my ($self, $ev, $x, $y) = @_;
2837
2838 if ($ev->{button} == $self->{button}) {
2839 undef $GRAB;
2840 $self->hide;
2841
2842 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover};
2844 }
2845}
2846
2847#############################################################################
2848
2849package CFClient::UI::Statusbox;
2850
2851our @ISA = CFClient::UI::VBox::;
2852
2853sub new {
2854 my $class = shift;
2855
2856 $class->SUPER::new (
2857 fontsize => 0.8,
2858 @_,
2859 )
2860}
2861
2862sub reorder {
2863 my ($self) = @_;
2864 my $NOW = time;
2865
2866 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 }
2869
2870 my @widgets;
2871
2872 my @items = sort {
2873 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} };
2876
2877 my $count = 10 + 1;
2878 for my $item (@items) {
2879 last unless --$count;
2880
2881 push @widgets, $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text};
2886
2887 for ($short) {
2888 s/^\s+//;
2889 s/\s+/ /g;
2890 }
2891
2892 new CFClient::UI::Label
2893 markup => $short,
2894 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg},
2900 can_events => 1,
2901 can_hover => 1
2902 };
2903 }
2904
2905 $self->clear;
2906 $self->SUPER::add (reverse @widgets);
2907}
2908
2909sub add {
2910 my ($self, $text, %arg) = @_;
2911
2912 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//;
2914
2915 return unless $text;
2916
2917 my $timeout = time + ((delete $arg{timeout}) || 60);
2918
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920
2921 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) {
2923 $item->{count}++;
2924 } else {
2925 $item->{count} = 1;
2926 $item->{text} = $item->{tooltip} = $text;
2927 }
2928 $item->{id} = ++$self->{id};
2929 $item->{timeout} = $timeout;
2930 delete $item->{label};
2931 } else {
2932 $self->{item}{$group} = {
2933 id => ++$self->{id},
2934 text => $text,
2935 timeout => $timeout,
2936 tooltip => $text,
2937 fg => [0.8, 0.8, 0.8, 0.8],
2938 pri => 0,
2939 count => 1,
2940 %arg,
2941 };
2942 }
2943
2944 $self->reorder;
2945}
2946
2947sub reconfigure {
2948 my ($self) = @_;
2949
2950 delete $_->{label}
2951 for values %{ $self->{item} || {} };
2952
2953 $self->reorder;
2954 $self->SUPER::reconfigure;
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Root;
1658 2960
1659our @ISA = CFClient::UI::Container::; 2961our @ISA = CFClient::UI::Container::;
1660 2962
2963use CFClient::OpenGL;
2964
2965sub new {
2966 my $class = shift;
2967
2968 $class->SUPER::new (
2969 @_,
2970 )
2971}
2972
2973sub configure {
2974 my ($self, $x, $y, $w, $h) = @_;
2975
2976 $self->{w} = $w;
2977 $self->{h} = $h;
2978}
2979
2980sub check_size {
2981 my ($self) = @_;
2982
2983 $self->size_allocate ($self->{w}, $self->{h})
2984 if $self->{w};
2985}
2986
1661sub size_request { 2987sub size_request {
1662 ($::WIDTH, $::HEIGHT) 2988 my ($self) = @_;
2989
2990 ($self->{w}, $self->{h})
1663} 2991}
1664 2992
1665sub size_allocate { 2993sub size_allocate {
1666 my ($self, $x, $y, $w, $h) = @_; 2994 my ($self, $w, $h) = @_;
1667 2995
1668 $self->_size_allocate ($x, $y, $w, $h); 2996 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1669 2998
1670 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
1671 for @{$self->{children}}; 3000 if exists $child->{req_x};
1672}
1673 3001
1674sub translate { 3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3003 if exists $child->{req_y};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007
3008 $child->configure ($X, $Y, $W, $H);
3009 }
3010}
3011
3012sub coord2local {
1675 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
1676 3014
1677 ($x, $y) 3015 ($x, $y)
1678} 3016}
1679 3017
3018sub coord2global {
3019 my ($self, $x, $y) = @_;
3020
3021 ($x, $y)
3022}
3023
1680sub update { 3024sub update {
1681 my ($self) = @_; 3025 my ($self) = @_;
1682 3026
1683 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 3027 $self->check_size;
1684 ::refresh (); 3028 $::WANT_REFRESH++;
1685} 3029}
1686 3030
1687sub add { 3031sub add {
1688 my ($self, $widget) = @_; 3032 my ($self, @children) = @_;
1689 3033
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1;
3042
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047
1690 $self->SUPER::add ($widget); 3048 $self->SUPER::add (@children);
1691
1692 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1693} 3049}
1694 3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3055
3056 while (@children) {
3057 my $w = pop @children;
3058 push @children, $w->children;
3059 $w->set_invisible;
3060 }
3061}
3062
3063sub on_refresh {
3064 my ($self, $id, $cb) = @_;
3065
3066 $self->{refresh_hook}{$id} = $cb;
3067}
3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
1695sub draw { 3075sub draw {
1696 my ($self) = @_; 3076 my ($self) = @_;
3077
3078 while ($self->{refresh_hook}) {
3079 $_->()
3080 for values %{delete $self->{refresh_hook}};
3081 }
3082
3083 if ($self->{check_size}) {
3084 my @queue = ([], []);
3085
3086 for (;;) {
3087 if ($self->{check_size}) {
3088 # heuristic: check containers last
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3090 for values %{delete $self->{check_size}}
3091 }
3092
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3094
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3096 ? @$widget{qw(user_w user_h)}
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102
3103 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h;
3105
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3107
3108 $widget->{parent}->check_size
3109 if $widget->{parent};
3110 }
3111 }
3112 }
3113
3114 while ($self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) {
3116 my ($widget, $w, $h) = @$_;
3117
3118 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0;
3120
3121 $widget->{w} = $w;
3122 $widget->{h} = $h;
3123 $widget->emit (size_allocate => $w, $h);
3124 }
3125 }
3126
3127 while ($self->{post_alloc_hook}) {
3128 $_->()
3129 for values %{delete $self->{post_alloc_hook}};
3130 }
3131
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT;
3135
3136 glMatrixMode GL_PROJECTION;
3137 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity;
1697 3141
1698 $self->_draw; 3142 $self->_draw;
1699} 3143}
1700 3144
1701############################################################################# 3145#############################################################################
1702 3146
1703package CFClient::UI; 3147package CFClient::UI;
1704 3148
1705$TOPLEVEL = new CFClient::UI::Toplevel; 3149$ROOT = new CFClient::UI::Root;
3150$TOOLTIP = new CFClient::UI::Tooltip z => 900;
1706 3151
17071 31521
1708 3153

Diff Legend

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