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.165 by root, Mon Apr 24 08:22:22 2006 UTC vs.
Revision 1.254 by root, Mon May 29 01:53:23 2006 UTC

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

Diff Legend

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