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

Diff Legend

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