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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines