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

Diff Legend

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