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.183 by elmex, Sun Apr 30 13:10:46 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 $self->emit (size_allocate => $w, $h);
243 } 363 }
244} 364}
245 365
246sub size_allocate { 366sub size_allocate {
247 # nothing to be done 367 # nothing to be done
248} 368}
249 369
250sub children { 370sub children {
251} 371}
252 372
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261}
262
263sub set_max_size { 373sub set_max_size {
264 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
265 375
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 376 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 377 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 378}
269 379
270# return top left coordinates 380sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 381 my ($self, $tooltip) = @_;
273 382
274 $self->{parent} 383 $tooltip =~ s/^\s+//;
275 or Carp::confess "no parent widget in _topleft\n";#d# 384 $tooltip =~ s/\s+$//;
276 385
277 $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 }
278} 394}
279 395
280# translate global coordinates to local coordinate system 396# translate global coordinates to local coordinate system
281sub coord2local { 397sub coord2local {
282 my ($self, $x, $y) = @_; 398 my ($self, $x, $y) = @_;
283 399
284 my ($X, $Y) = $self->_topleft; 400 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 401}
287 402
288# translate local coordinates to global coordinate system 403# translate local coordinates to global coordinate system
289sub coord2global { 404sub coord2global {
290 my ($self, $x, $y) = @_; 405 my ($self, $x, $y) = @_;
291 406
292 my ($X, $Y) = $self->_topleft; 407 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 408}
295 409
296sub focus_in { 410sub focus_in {
297 my ($self) = @_; 411 my ($self) = @_;
298 412
299 return if $FOCUS == $self; 413 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 414 return unless $self->{can_focus};
301 415
302 my $focus = $FOCUS; $FOCUS = $self; 416 my $focus = $FOCUS; $FOCUS = $self;
303 417
304 $self->emit (focus_in => $focus); 418 $self->_emit (focus_in => $focus);
305 419
306 $focus->update if $focus; 420 $focus->update if $focus;
307 $FOCUS->update; 421 $FOCUS->update;
308} 422}
309 423
… …
312 426
313 return unless $FOCUS == $self; 427 return unless $FOCUS == $self;
314 428
315 my $focus = $FOCUS; undef $FOCUS; 429 my $focus = $FOCUS; undef $FOCUS;
316 430
317 $self->emit (focus_out => $focus); 431 $self->_emit (focus_out => $focus);
318 432
319 $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;
320} 437}
321 438
322sub mouse_motion { } 439sub mouse_motion { }
323sub button_up { } 440sub button_up { }
324sub key_down { } 441sub key_down { }
325sub key_up { } 442sub key_up { }
326 443
327sub button_down { 444sub button_down {
328 my ($self, $ev, $x, $y) = @_; 445 my ($self, $ev, $x, $y) = @_;
329 446
330 $self->focus_in; 447 $self->focus_in;
… …
333sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
334sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
335sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
336sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
337sub 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}
338 518
339sub draw { 519sub draw {
340 my ($self) = @_; 520 my ($self) = @_;
341 521
342 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
364 if ($ENV{PCLIENT_DEBUG}) { 544 if ($ENV{PCLIENT_DEBUG}) {
365 glPushMatrix; 545 glPushMatrix;
366 glColor 1, 1, 0, 1; 546 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP; 548 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0; 549 glVertex 0 , 0;
370 glVertex $self->{w}, 0; 550 glVertex $self->{w} - 1, 0;
371 glVertex $self->{w}, $self->{h}; 551 glVertex $self->{w} - 1, $self->{h} - 1;
372 glVertex 0 , $self->{h}; 552 glVertex 0 , $self->{h} - 1;
373 glEnd; 553 glEnd;
374 glPopMatrix; 554 glPopMatrix;
375 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;
376 } 556 }
377} 557}
378 558
379sub _draw { 559sub _draw {
380 my ($self) = @_; 560 my ($self) = @_;
381 561
382 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
383} 563}
384 564
385sub find_widget {
386 my ($self, $x, $y) = @_;
387
388 return () unless $self->{can_events};
389
390 return $self
391 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394 ()
395}
396
397sub set_parent {
398 my ($self, $parent) = @_;
399
400 Scalar::Util::weaken ($self->{parent} = $parent);
401}
402
403sub check_size {
404 my ($self) = @_;
405
406 $self->{parent}
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427}
428
429sub update {
430 my ($self) = @_;
431
432 $self->{parent}->update
433 if $self->{parent};
434}
435
436sub connect {
437 my ($self, $signal, $cb) = @_;
438
439 push @{ $self->{signal_cb}{$signal} }, $cb;
440}
441
442sub emit {
443 my ($self, $signal, @args) = @_;
444
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446}
447
448sub DESTROY { 565sub DESTROY {
449 my ($self) = @_; 566 my ($self) = @_;
450 567
568 delete $WIDGET{$self+0};
451 #$self->deactivate; 569 #$self->deactivate;
452} 570}
453 571
454############################################################################# 572#############################################################################
455 573
… …
464 my $class = shift; 582 my $class = shift;
465 583
466 # range [value, low, high, page] 584 # range [value, low, high, page]
467 585
468 $class->SUPER::new ( 586 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 587 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 588 #active_bg => [1, 1, 1, 0.5],
471 @_ 589 @_
472 ) 590 )
473} 591}
474 592
475sub _draw { 593sub _draw {
476 my ($self) = @_; 594 my ($self) = @_;
477 595
596 my $color = $FOCUS == $self && $self->{active_bg}
597 ? $self->{active_bg}
598 : $self->{bg};
599
600 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 601 my ($w, $h) = @$self{qw(w h)};
479 602
480 glEnable GL_BLEND; 603 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 605 glColor @$color;
483 606
484 glBegin GL_QUADS; 607 glBegin GL_QUADS;
485 glVertex 0 , 0; 608 glVertex 0 , 0;
486 glVertex 0 , $h; 609 glVertex 0 , $h;
487 glVertex $w, $h; 610 glVertex $w, $h;
488 glVertex $w, 0; 611 glVertex $w, 0;
489 glEnd; 612 glEnd;
490 613
491 glDisable GL_BLEND; 614 glDisable GL_BLEND;
615 }
492} 616}
493 617
494############################################################################# 618#############################################################################
495 619
496package CFClient::UI::Empty; 620package CFClient::UI::Empty;
… …
528 652
529 $self 653 $self
530} 654}
531 655
532sub add { 656sub add {
533 my ($self, $child) = @_; 657 my ($self, @widgets) = @_;
534 658
535 $child->set_parent ($self); 659 $_->set_parent ($self)
660 for @widgets;
536 661
537 use sort 'stable'; 662 use sort 'stable';
538 663
539 $self->{children} = [ 664 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 666 @{$self->{children}}, @widgets
542 ]; 667 ];
543 668
544 $child->check_size; 669 $self->realloc;
545 $self->update;
546} 670}
547 671
548sub children { 672sub children {
549 @{ $_[0]{children} } 673 @{ $_[0]{children} }
550} 674}
… …
555 delete $child->{parent}; 679 delete $child->{parent};
556 $child->hide; 680 $child->hide;
557 681
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 683
560 $self->check_size; 684 $self->realloc;
561 $self->update;
562} 685}
563 686
564sub clear { 687sub clear {
565 my ($self) = @_; 688 my ($self) = @_;
566 689
… …
570 for (@$children) { 693 for (@$children) {
571 delete $_->{parent}; 694 delete $_->{parent};
572 $_->hide; 695 $_->hide;
573 } 696 }
574 697
575 $self->check_size; 698 $self->realloc;
576 $self->update;
577} 699}
578 700
579sub find_widget { 701sub find_widget {
580 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
581 703
… …
634sub size_request { 756sub size_request {
635 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
636} 758}
637 759
638sub size_allocate { 760sub size_allocate {
639 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
640 762
641 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
642} 764}
643 765
644############################################################################# 766#############################################################################
… …
656} 778}
657 779
658sub update { 780sub update {
659 my ($self) = @_; 781 my ($self) = @_;
660 782
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 784 $self->SUPER::update;
663} 785}
664 786
665sub size_allocate { 787sub size_allocate {
666 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
667 789
668 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
669 $self->update; 791 $self->update
792 if $changed;
670} 793}
671 794
672sub _render { 795sub _render {
673 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
674} 797}
… …
679 $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 {
680 glClearColor 0, 0, 0, 0; 803 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 804 glClear GL_COLOR_BUFFER_BIT;
682 805
683 $self->_render; 806 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 807 };
692} 808}
693 809
694sub _draw { 810sub _draw {
695 my ($self) = @_; 811 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 813 my ($w, $h) = ($self->w, $self->h);
698 814
699 my $tex = $self->{texture} 815 my $tex = $self->{texture}
700 or return; 816 or return;
701 817
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 820 glColor 1, 1, 1, 1;
707 821
708 $tex->draw_quad (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 823
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
712} 825}
713 826
714############################################################################# 827#############################################################################
715 828
716package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
717 830
718our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
719 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
720sub size_request { 843sub size_request {
721 my ($self) = @_; 844 my ($self) = @_;
722 845
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 847
726 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
727} 852}
728 853
729sub size_allocate { 854sub size_allocate {
730 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
731 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);
732 $self->update; 861 $self->update;
733} 862}
734 863
735sub set_offset { 864sub set_offset {
736 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 868 $self->{view_y} = int $y;
740 869
741 $self->update; 870 $self->update;
742} 871}
743 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
744sub _render { 901sub _render {
745 my ($self) = @_; 902 my ($self) = @_;
746 903
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748 905
… …
759 my $class = shift; 916 my $class = shift;
760 917
761 my $self; 918 my $self;
762 919
763 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
764 vertical => 1, 921 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 923 on_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 924 $self->{vp}->set_offset (0, $_[1]);
768 }, 925 },
769 ; 926 ;
770 927
771 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 929 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 930 slider => $slider,
774 @_, 931 @_,
775 ); 932 );
776 933
777 $self->{vp}->add ($self->{scrolled}); 934 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
780 937
781 $self 938 $self
782} 939}
783 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
784#TODO# update range on size_allocate depeneing on child 960#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 961# update viewport offset on scroll
786 962
787############################################################################# 963#############################################################################
788 964
789package CFClient::UI::Frame; 965package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 969use CFClient::OpenGL;
794 970
795sub new { 971sub new {
796 my $class = shift; 972 my $class = shift;
797 973
798 my $self = $class->SUPER::new ( 974 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 975 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 976 @_,
803 ); 977 )
804
805 $self
806} 978}
807 979
808sub _draw { 980sub _draw {
809 my ($self) = @_; 981 my ($self) = @_;
810 982
811 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
812 985
813 glEnable GL_BLEND; 986 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 989
818# glBegin GL_QUADS; 990 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 991 glVertex 0 , 0;
821# glVertex 0 , $h; 992 glVertex 0 , $h;
822# glVertex $w, $h; 993 glVertex $w, $h;
823# glVertex $w, 0; 994 glVertex $w, 0;
824# glEnd; 995 glEnd;
825 996
826
827 $self->child->draw;
828 glDisable GL_BLEND; 997 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
830} 1001}
831 1002
832############################################################################# 1003#############################################################################
833 1004
834package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
842 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);
843 1014
844sub new { 1015sub new {
845 my $class = shift; 1016 my $class = shift;
846 1017
847 # TODO: user_x, user_y, overwrite moveto?
848
849 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
852 border => 0.6, 1021 border => 0.6,
1022 is_toplevel => 1,
853 can_events => 1, 1023 can_events => 1,
854 @_ 1024 @_
855 ); 1025 );
856 1026
857 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
858 align => 0, 1028 align => 0,
… …
877 $h + $self->border * 2, 1047 $h + $self->border * 2,
878 ) 1048 )
879} 1049}
880 1050
881sub size_allocate { 1051sub size_allocate {
882 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
883 1055
884 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
886 1058
887 $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)
888 if $self->{title}; 1060 if $self->{title};
889 1061
890 $self->child->configure ($self->border, $self->border, $w, $h); 1062 $self->child->configure ($self->border, $self->border, $w, $h);
891} 1063}
892 1064
… …
911 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
912 1084
913 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
915 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
919 $self->check_size; 1093 $self->realloc;
920 }; 1094 };
921 1095
922 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
923 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
924 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
926 $self->{motion} = sub { 1100 $self->{motion} = sub {
927 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
928 1102
929 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
930 1104
931 $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});
932 $self->update; 1109 $self->realloc;
933 }; 1110 };
934 } 1111 }
935} 1112}
936 1113
937sub button_up { 1114sub button_up {
… …
950 my ($self) = @_; 1127 my ($self) = @_;
951 1128
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1129 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 1131
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1132 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1134
960 my $border = $self->border; 1135 my $border = $self->border;
961 1136
962 glColor @{ $self->{border_bg} }; 1137 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1142
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1144 my $bg = $tex[0];
970 1145
971 # TODO: repeat texture not scale 1146 # TODO: repeat texture not scale
… …
975 glColor @{ $self->{bg} }; 1150 glColor @{ $self->{bg} };
976 1151
977 $bg->{s} = $rep_x; 1152 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y; 1153 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1; 1154 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 }
981 1157
982 glDisable GL_TEXTURE_2D; 1158 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1159
986 $self->{title}->draw if $self->{title}; 1160 $self->{title}->draw if $self->{title};
987 1161
988 $self->child->draw; 1162 $self->child->draw;
989} 1163}
… …
1001sub new { 1175sub new {
1002 my $class = shift; 1176 my $class = shift;
1003 1177
1004 $class->SUPER::new ( 1178 $class->SUPER::new (
1005 col_expand => [], 1179 col_expand => [],
1006 @_ 1180 @_,
1007 ) 1181 )
1182}
1183
1184sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008} 1186}
1009 1187
1010sub add { 1188sub add {
1011 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1012 1190
1013 $child->set_parent ($self); 1191 $child->set_parent ($self);
1014 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1015 1193
1016 $child->check_size; 1194 $self->realloc;
1017} 1195}
1018 1196
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
1023# 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?
1024sub clear { 1198sub clear {
1025 my ($self) = @_; 1199 my ($self) = @_;
1026 1200
1027 my @children = $self->children; 1201 my @children = $self->children;
1028 delete $self->{children}; 1202 delete $self->{children};
… …
1030 for (@children) { 1204 for (@children) {
1031 delete $_->{parent}; 1205 delete $_->{parent};
1032 $_->hide; 1206 $_->hide;
1033 } 1207 }
1034 1208
1035 $self->update; 1209 $self->realloc;
1036} 1210}
1037 1211
1038sub get_wh { 1212sub get_wh {
1039 my ($self) = @_; 1213 my ($self) = @_;
1040 1214
… …
1067 (sum @$hs), 1241 (sum @$hs),
1068 ) 1242 )
1069} 1243}
1070 1244
1071sub size_allocate { 1245sub size_allocate {
1072 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1073 1247
1074 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1075 1249
1076 my $req_w = sum @$ws; 1250 my $req_w = (sum @$ws) || 1;
1077 my $req_h = sum @$hs; 1251 my $req_h = (sum @$hs) || 1;
1078 1252
1079 # TODO: nicer code && do row_expand 1253 # TODO: nicer code && do row_expand
1080 my @col_expand = @{$self->{col_expand}}; 1254 my @col_expand = @{$self->{col_expand}};
1081 @col_expand = (1) x @$ws unless @col_expand; 1255 @col_expand = (1) x @$ws unless @col_expand;
1082 my $col_expand = (sum @col_expand) || 1; 1256 my $col_expand = (sum @col_expand) || 1;
… …
1136 } 1310 }
1137} 1311}
1138 1312
1139############################################################################# 1313#############################################################################
1140 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
1141package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1142 1376
1143# TODO: wrap into common Box base class
1144
1145our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1146 1378
1147sub size_request { 1379sub new {
1148 my ($self) = @_; 1380 my $class = shift;
1149 1381
1150 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1151 1383 vertical => 0,
1152 ( 1384 @_,
1153 (List::Util::sum map $_->[0], @alloc),
1154 (List::Util::max map $_->[1], @alloc),
1155 ) 1385 )
1156} 1386}
1157 1387
1158sub size_allocate {
1159 my ($self, $w, $h) = @_;
1160
1161 ($h, $w) = ($w, $h);
1162
1163 my $children = $self->{children};
1164
1165 my @h = map $_->{req_w}, @$children;
1166
1167 my $req_h = List::Util::sum @h;
1168
1169 if ($req_h > $h) {
1170 # ah well, not enough space
1171 $_ *= $h / $req_h for @h;
1172 } else {
1173 my $exp = List::Util::sum map $_->{expand}, @$children;
1174 $exp ||= 1;
1175
1176 for (0 .. $#$children) {
1177 my $child = $children->[$_];
1178
1179 my $alloc_h = $h[$_];
1180 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1181 $h[$_] = $alloc_h;
1182 }
1183 }
1184
1185 CFClient::UI::harmonize \@h;
1186
1187 my $y = 0;
1188 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190 my $h = $h[$_];
1191 $child->configure ($y, 0, $h, $w);
1192
1193 $y += $h;
1194 }
1195
1196 1
1197}
1198
1199############################################################################# 1388#############################################################################
1200 1389
1201package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1202 1391
1203# TODO: wrap into common Box base class
1204
1205our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1206 1393
1207sub size_request { 1394sub new {
1208 my ($self) = @_; 1395 my $class = shift;
1209 1396
1210 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1211 1398 vertical => 1,
1212 ( 1399 @_,
1213 (List::Util::max map $_->[0], @alloc),
1214 (List::Util::sum map $_->[1], @alloc),
1215 ) 1400 )
1216} 1401}
1217 1402
1218sub size_allocate {
1219 my ($self, $w, $h) = @_;
1220
1221 my $children = $self->{children};
1222
1223 my @h = map $_->{req_h}, @$children;
1224
1225 my $req_h = List::Util::sum @h;
1226
1227 if ($req_h > $h) {
1228 # ah well, not enough space
1229 $_ *= $h / $req_h for @h;
1230 } else {
1231 my $exp = List::Util::sum map $_->{expand}, @$children;
1232 $exp ||= 1;
1233
1234 for (0 .. $#$children) {
1235 my $child = $children->[$_];
1236
1237 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1238 }
1239 }
1240
1241 CFClient::UI::harmonize \@h;
1242
1243 my $y = 0;
1244 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_];
1247 $child->configure (0, $y, $w, $h);
1248
1249 $y += $h;
1250 }
1251
1252 1
1253}
1254
1255############################################################################# 1403#############################################################################
1256 1404
1257package CFClient::UI::Label; 1405package CFClient::UI::Label;
1258 1406
1259our @ISA = CFClient::UI::Base::; 1407our @ISA = CFClient::UI::DrawBG::;
1260 1408
1261use CFClient::OpenGL; 1409use CFClient::OpenGL;
1262 1410
1263sub new { 1411sub new {
1264 my ($class, %arg) = @_; 1412 my ($class, %arg) = @_;
1265 1413
1266 my $self = $class->SUPER::new ( 1414 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1415 fg => [1, 1, 1],
1416 #bg => none
1417 #active_bg => none
1268 #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),
1269 fontsize => 1, 1424 fontsize => 1,
1270 text => "",
1271 align => -1, 1425 align => -1,
1272 valign => -1, 1426 valign => -1,
1273 padding => 2, 1427 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1428 can_events => 0,
1276 %arg 1429 %arg
1277 ); 1430 );
1278 1431
1279 if (exists $self->{template}) { 1432 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1433 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1434 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1435 $self->{template} = $layout;
1283 } 1436 }
1284 1437
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1438 if (exists $self->{markup}) {
1286 $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 }
1287 1443
1288 $self 1444 $self
1289} 1445}
1290 1446
1291sub escape { 1447sub escape($) {
1292 local $_ = $_[1]; 1448 local $_ = $_[0];
1293 1449
1294 s/&/&amp;/g; 1450 s/&/&amp;/g;
1295 s/>/&gt;/g; 1451 s/>/&gt;/g;
1296 s/</&lt;/g; 1452 s/</&lt;/g;
1297 1453
1298 $_[1] 1454 $_
1299} 1455}
1300 1456
1301sub update { 1457sub update {
1302 my ($self) = @_; 1458 my ($self) = @_;
1303 1459
1304 delete $self->{texture}; 1460 delete $self->{texture};
1305 $self->SUPER::update; 1461 $self->SUPER::update;
1306} 1462}
1307 1463
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1464sub set_text {
1315 my ($self, $text) = @_; 1465 my ($self, $text) = @_;
1316 1466
1317 return if $self->{text} eq "T$text"; 1467 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1319 1469
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1321 1472
1322 delete $self->{texture}; 1473 $self->realloc;
1323 $self->update;
1324 $self->check_size;
1325} 1474}
1326 1475
1327sub set_markup { 1476sub set_markup {
1328 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1329 1478
1330 return if $self->{text} eq "M$markup"; 1479 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1480 $self->{text} = "M$markup";
1332 1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1334 1486
1335 delete $self->{texture}; 1487 $self->realloc;
1336 $self->update;
1337 $self->check_size;
1338} 1488}
1339 1489
1340sub size_request { 1490sub size_request {
1341 my ($self) = @_; 1491 my ($self) = @_;
1342 1492
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $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});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1498
1347 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1348 1500
1349 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
… …
1361 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1362 ) 1514 )
1363} 1515}
1364 1516
1365sub size_allocate { 1517sub size_allocate {
1366 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1367 1519
1368 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1369} 1522}
1370 1523
1371sub set_fontsize { 1524sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1373 1526
1374 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1528 delete $self->{texture};
1376 $self->check_size; 1529
1377 $self->update; 1530 $self->realloc;
1378} 1531}
1379 1532
1380sub _draw { 1533sub _draw {
1381 my ($self) = @_; 1534 my ($self) = @_;
1382 1535
1536 $self->SUPER::_draw; # draw background, if applicable
1537
1383 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $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});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545
1387 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
1388 }; 1557 };
1389 1558
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1561
1562 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1563 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $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 }
1410 1568
1411 glDisable GL_TEXTURE_2D; 1569 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1570}
1414 1571
1415############################################################################# 1572#############################################################################
1416 1573
1417package CFClient::UI::EntryBase; 1574package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1431 can_hover => 1, 1588 can_hover => 1,
1432 can_focus => 1, 1589 can_focus => 1,
1433 valign => 0, 1590 valign => 0,
1434 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1435 @_ 1593 @_
1436 ) 1594 )
1437} 1595}
1438 1596
1439sub _set_text { 1597sub _set_text {
… …
1449 $self->{text} = $text; 1607 $self->{text} = $text;
1450 1608
1451 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1453 1611
1454 $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;
1455} 1622}
1456 1623
1457sub get_text { 1624sub get_text {
1458 $_[0]{text} 1625 $_[0]{text}
1459} 1626}
… …
1462 my ($self) = @_; 1629 my ($self) = @_;
1463 1630
1464 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1465 1632
1466 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text {
1476 my ($self, $text) = @_;
1477
1478 $self->{cursor} = length $text;
1479 $self->_set_text ($text);
1480 $self->update;
1481} 1634}
1482 1635
1483sub key_down { 1636sub key_down {
1484 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1485 1638
… …
1487 my $sym = $ev->{sym}; 1640 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1641 my $uni = $ev->{unicode};
1489 1642
1490 my $text = $self->get_text; 1643 my $text = $self->get_text;
1491 1644
1492 if ($sym == 8) { 1645 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1646 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1647 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1648 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1649 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1650 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1651 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1652 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1657 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1658 $self->_emit ('escape');
1506 } elsif ($uni) { 1659 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1661 }
1509 1662
1510 $self->_set_text ($text); 1663 $self->_set_text ($text);
1511 $self->update; 1664
1665 $self->realloc;
1512} 1666}
1513 1667
1514sub focus_in { 1668sub focus_in {
1515 my ($self) = @_; 1669 my ($self) = @_;
1516 1670
… …
1596 if ($sym == 13) { 1750 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1751 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1752 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1753 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1754 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1755 $self->_emit (activate => $txt);
1602 $self->update; 1756 $self->update;
1603 1757
1604 } elsif ($sym == CFClient::SDLK_UP) { 1758 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1759 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1760 $self->{history_saveback} = $self->get_text;
… …
1645 my $class = shift; 1799 my $class = shift;
1646 1800
1647 $class->SUPER::new ( 1801 $class->SUPER::new (
1648 padding => 4, 1802 padding => 4,
1649 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1652 can_hover => 1, 1805 can_hover => 1,
1653 align => 0, 1806 align => 0,
1654 valign => 0, 1807 valign => 0,
1655 can_events => 1, 1808 can_events => 1,
1656 @_ 1809 @_
1657 ) 1810 )
1658} 1811}
1659 1812
1813sub activate { }
1814
1660sub button_up { 1815sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1662 1817
1818 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1821}
1668 1822
1669sub _draw { 1823sub _draw {
1670 my ($self) = @_; 1824 my ($self) = @_;
1671 1825
… …
1673 1827
1674 if ($GRAB == $self) { 1828 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1829 $self->{fg} = $self->{active_fg};
1676 } 1830 }
1677 1831
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1834 glColor 0, 0, 0, 1;
1683 1835
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1836 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1837
1686 glDisable GL_TEXTURE_2D; 1838 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1839
1689 $self->SUPER::_draw; 1840 $self->SUPER::_draw;
1690} 1841}
1691 1842
1692############################################################################# 1843#############################################################################
… …
1706 1857
1707 $class->SUPER::new ( 1858 $class->SUPER::new (
1708 padding => 2, 1859 padding => 2,
1709 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1710 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],
1711 state => 0, 1864 state => 0,
1712 can_hover => 1, 1865 can_hover => 1,
1713 @_ 1866 @_
1714 ) 1867 )
1715} 1868}
… …
1724 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1725 1878
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1728 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1730 } 1883 }
1731} 1884}
1732 1885
1733sub _draw { 1886sub _draw {
1734 my ($self) = @_; 1887 my ($self) = @_;
… …
1739 1892
1740 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;
1741 1894
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1896
1744 glEnable GL_BLEND; 1897 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898
1745 glEnable GL_TEXTURE_2D; 1899 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1900 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1901 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1902}
1755 1903
1756############################################################################# 1904#############################################################################
1757 1905
1758package CFClient::UI::Image; 1906package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1949 glTranslate 0, -$self->{w}, 0;
1802 1950
1803 ($w, $h) = ($h, $w); 1951 ($w, $h) = ($h, $w);
1804 } 1952 }
1805 1953
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1954 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1956
1811 $tex->draw_quad (0, 0, $w, $h); 1957 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1958
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1959 glDisable GL_TEXTURE_2D;
1815} 1960}
1816 1961
1817############################################################################# 1962#############################################################################
1818 1963
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2152 qw(s1_slider.png s1_slider_bg.png);
2008 2153
2009sub new { 2154sub new {
2010 my $class = shift; 2155 my $class = shift;
2011 2156
2012 # range [value, low, high, page] 2157 # range [value, low, high, page, unit]
2013 2158
2014 # TODO: 0-width page 2159 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2160 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2161 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2162 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2019 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],
2020 range => [0, 0, 100, 10], 2167 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2168 req_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2169 req_h => $::WIDTH / 80,
2023 vertical => 0, 2170 vertical => 0,
2024 can_hover => 1, 2171 can_hover => 1,
2025 inner_pad => 5, 2172 inner_pad => 0.02,
2026 @_ 2173 @_
2027 ); 2174 );
2028 2175
2176 $self->set_value ($self->{range}[0]);
2177 $self->update;
2178
2029 $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 }
2030} 2214}
2031 2215
2032sub size_request { 2216sub size_request {
2033 my ($self) = @_; 2217 my ($self) = @_;
2034 2218
… …
2040 2224
2041sub button_down { 2225sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2226 my ($self, $ev, $x, $y) = @_;
2043 2227
2044 $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
2045 $self->mouse_motion ($ev, $x, $y); 2232 $self->mouse_motion ($ev, $x, $y);
2046} 2233}
2047 2234
2048sub mouse_motion { 2235sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2236 my ($self, $ev, $x, $y) = @_;
2050 2237
2051 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
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2255 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100;
2053 2257
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2258 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2259
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2260 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2261 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2262
2059 $x -= $inner_pad_px; # substract the padding 2263 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2264 $value = $value * $self->{scale} + $self->{offset};
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2265
2065 $self->emit (changed => $x); 2266 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2267 $self->{knob_w} = $knob_w;
2067 } 2268 });
2068}
2069 2269
2070# the inner_* stuff is for generating a padding for the slider handle, 2270 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2271}
2077 2272
2078sub _draw { 2273sub _draw {
2079 my ($self) = @_; 2274 my ($self) = @_;
2080 2275
2081 $self->SUPER::_draw (); 2276 $self->SUPER::_draw ();
2082 2277
2083 my ($w, $h) = @$self{qw(w h)}; 2278 glScale $self->{w}, $self->{h};
2084 2279
2085 if ($self->{vertical}) { 2280 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2281 # draw a vertical slider like a rotated horizontal slider
2087 2282
2283 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2284 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2285 }
2093 2286
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2287 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2288 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2289
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2290 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2292
2120 # draw background 2293 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2294 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2295
2123 # draw handle 2296 # draw handle
2124 $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);
2125 2298
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2128} 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 (@_) }
2129 2342
2130############################################################################# 2343#############################################################################
2131 2344
2132package CFClient::UI::TextView; 2345package CFClient::UI::TextView;
2133 2346
… …
2142 fontsize => 1, 2355 fontsize => 1,
2143 can_events => 0, 2356 can_events => 0,
2144 #font => default_font 2357 #font => default_font
2145 @_, 2358 @_,
2146 2359
2147 layout => (new CFClient::Layout), 2360 layout => (new CFClient::Layout 1),
2148 par => [], 2361 par => [],
2149 height => 0, 2362 height => 0,
2150 children => [ 2363 children => [
2151 (new CFClient::UI::Empty expand => 1), 2364 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2365 (new CFClient::UI::Slider vertical => 1),
… …
2163 2376
2164 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2378 $self->reflow;
2166} 2379}
2167 2380
2168sub text_height {
2169 my ($self, $text) = @_;
2170
2171 my $layout = $self->{layout};
2172
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_text ($text);
2176
2177 ($layout->size)[1]
2178}
2179
2180sub reflow {
2181 my ($self) = @_;
2182
2183 $self->{need_reflow}++;
2184 $self->update;
2185}
2186
2187sub size_allocate { 2381sub size_allocate {
2188 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2189 2383
2190 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2191 2387
2192 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2193 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2391
2196 $self->reflow; 2392 $self->reflow;
2197} 2393}
2198 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
2199sub add_paragraph { 2429sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2430 my ($self, $color, $text, $indent) = @_;
2201 2431
2202 #TODO: intelligently "reformat" paragraph 2432 for my $line (split /\n/, $text) {
2203 2433 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2434 $self->{height} += $h;
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2436 }
2207 2437
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $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]);
2211 $self->{children}[1]->update;
2212} 2439}
2213 2440
2214sub update { 2441sub update {
2215 my ($self) = @_; 2442 my ($self) = @_;
2216 2443
… …
2218 2445
2219 return unless $self->{h} > 0; 2446 return unless $self->{h} > 0;
2220 2447
2221 delete $self->{texture}; 2448 delete $self->{texture};
2222 2449
2223 $ROOT->on_refresh ($self, sub { 2450 $ROOT->on_post_alloc ($self, sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452
2224 if (delete $self->{need_reflow}) { 2453 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2454 my $height = 0;
2226 2455
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2228 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 }
2229 2471
2230 $self->{height} = $height; 2472 $self->{height} = $height;
2231 2473
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2475
2234 delete $self->{texture}; 2476 delete $self->{texture};
2235 } 2477 }
2236 2478
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2480 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2481 glClear GL_COLOR_BUFFER_BIT;
2240 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
2241 glEnable GL_BLEND; 2494 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0];
2247
2248 my $y0 = $top;
2249 my $y1 = $top + $self->{h};
2250
2251 my $y = 0;
2252
2253 my $layout = $self->{layout};
2254
2255 $layout->set_font ($self->{font}) if $self->{font};
2256 2497
2257 for my $par (@{$self->{par}}) { 2498 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2499 my $h = $par->[1];
2259 2500
2260 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]);
2261 $layout->set_text ($par->[2]); 2504 $layout->set_markup ($par->[4]);
2262 2505
2263 glColor @{ $par->[1] }; 2506 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2507
2265 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;
2266 } 2510 }
2267 2511
2268 $y += $h; 2512 $y += $h;
2269 } 2513 }
2270 2514
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2515 glDisable GL_BLEND;
2273 }; 2516 };
2274 }); 2517 });
2275} 2518}
2276 2519
2277sub _draw { 2520sub _draw {
2278 my ($self) = @_; 2521 my ($self) = @_;
2279 2522
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2523 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2525 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2527 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2528
2289 $self->{children}[1]->draw; 2529 $self->{children}[1]->draw;
2290 2530
2291} 2531}
2292 2532
… …
2340 2580
2341sub new { 2581sub new {
2342 my $class = shift; 2582 my $class = shift;
2343 2583
2344 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2345 state => 0, 2585 state => 0,
2346 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2347 @_ 2587 @_
2348 ); 2588 );
2349 2589
2350 if ($self->{state}) {
2351 $self->{state} = 0;
2352 $self->toggle_flopper;
2353 }
2354
2355 $self 2590 $self
2356} 2591}
2357 2592
2358sub toggle_flopper { 2593sub toggle_flopper {
2359 my ($self) = @_; 2594 my ($self) = @_;
2360 2595
2361 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2362 if ($self->{state} = !$self->{state}) {
2363 $CFClient::UI::ROOT->add ($self->{other});
2364 $self->{other}->move ($self->coord2global (0, $self->{h}));
2365 $self->emit ("open");
2366 } else {
2367 $CFClient::UI::ROOT->remove ($self->{other});
2368 $self->emit ("close");
2369 }
2370
2371 $self->emit (changed => $self->{state});
2372} 2597}
2373 2598
2374############################################################################# 2599#############################################################################
2375 2600
2376package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2386 @_, 2611 @_,
2387 can_events => 0, 2612 can_events => 0,
2388 ) 2613 )
2389} 2614}
2390 2615
2391sub set_markup { 2616sub set_tooltip_from {
2392 my ($self, $text) = @_; 2617 my ($self, $widget) = @_;
2393 2618
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2619 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2620 markup => $widget->{tooltip},
2396 $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 );
2397} 2627}
2398 2628
2399sub size_request { 2629sub size_request {
2400 my ($self) = @_; 2630 my ($self) = @_;
2401 2631
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2633
2406 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2407} 2635}
2408 2636
2409sub size_allocate { 2637sub size_allocate {
2410 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2411 2639
2640 return unless $changed;
2641
2412 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2413} 2643}
2414 2644
2415sub _draw { 2645sub _draw {
2416 my ($self) = @_; 2646 my ($self) = @_;
2417 2647
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2648 glTranslate 0.375, 0.375;
2420 2649
2421 my ($w, $h) = @$self{qw(w h)}; 2650 my ($w, $h) = @$self{qw(w h)};
2422 2651
2423 glColor 1, 0.8, 0.4; 2652 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2663 glVertex 0 , $h;
2435 glVertex $w, $h; 2664 glVertex $w, $h;
2436 glVertex $w, 0; 2665 glVertex $w, 0;
2437 glEnd; 2666 glEnd;
2438 2667
2439 glPopMatrix; 2668 glTranslate 2 - 0.375, 2 - 0.375;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2669 $self->SUPER::_draw;
2443} 2670}
2444 2671
2445############################################################################# 2672#############################################################################
2446 2673
… …
2451use CFClient::OpenGL; 2678use CFClient::OpenGL;
2452 2679
2453sub new { 2680sub new {
2454 my $class = shift; 2681 my $class = shift;
2455 2682
2456 $class->SUPER::new ( 2683 my $self = $class->SUPER::new (
2457 aspect => 1, 2684 aspect => 1,
2685 can_events => 0,
2458 @_, 2686 @_,
2459 ) 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
2460} 2704}
2461 2705
2462sub size_request { 2706sub size_request {
2463 (32, 8) 2707 (32, 8)
2464} 2708}
2465 2709
2710sub update {
2711 my ($self) = @_;
2712
2713 return unless $self->{visible};
2714
2715 $self->SUPER::update;
2716}
2717
2466sub _draw { 2718sub _draw {
2467 my ($self) = @_; 2719 my ($self) = @_;
2468 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
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2733
2471 # TODO animation
2472 if ($tex) { 2734 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2735 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2737 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2739 glDisable GL_TEXTURE_2D;
2480 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++;
2481 } 2791 }
2482} 2792}
2483 2793
2484############################################################################# 2794#############################################################################
2485 2795
… …
2521 2831
2522# popup given the event (must be a mouse button down event currently) 2832# popup given the event (must be a mouse button down event currently)
2523sub popup { 2833sub popup {
2524 my ($self, $ev) = @_; 2834 my ($self, $ev) = @_;
2525 2835
2526 $self->emit ("popdown"); 2836 $self->_emit ("popdown");
2527 2837
2528 # maybe save $GRAB? must be careful about events... 2838 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2839 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2840 $self->{button} = $ev->{button};
2531 2841
… …
2546 2856
2547 if ($ev->{button} == $self->{button}) { 2857 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2858 undef $GRAB;
2549 $self->hide; 2859 $self->hide;
2550 2860
2551 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2862 $self->{hover}[1]->() if $self->{hover};
2553 } 2863 }
2554} 2864}
2555 2865
2556############################################################################# 2866#############################################################################
2557 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 @_,
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;
2974}
2975
2976#############################################################################
2977
2558package CFClient::UI::Root; 2978package CFClient::UI::Root;
2559 2979
2560our @ISA = CFClient::UI::Container::; 2980our @ISA = CFClient::UI::Container::;
2561 2981
2562use CFClient::OpenGL; 2982use CFClient::OpenGL;
2563 2983
2564sub check_size { 2984sub new {
2565 my ($self) = @_; 2985 my $class = shift;
2566 2986
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2987 my $self = $class->SUPER::new (
2568} 2988 visible => 1,
2989 @_,
2990 );
2569 2991
2570sub size_request { 2992 Scalar::Util::weaken ($self->{root} = $self);
2571 ($::WIDTH, $::HEIGHT) 2993
2994 $self
2572} 2995}
2573 2996
2574sub configure { 2997sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2576 2999
2577 $self->SUPER::configure ($x, $y, $w, $h); 3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
2578 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
2579 for my $child (@{$self->{children}}) { 3022 for my $child ($self->children) {
2580 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)};
2581 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
2582 $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;
2583 $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
2584 $child->configure ($X, $Y, $W,$H); 3036 $child->configure ($X, $Y, $W, $H);
2585 } 3037 }
2586} 3038}
2587 3039
2588sub _topleft { 3040sub coord2local {
2589 my ($self, $x, $y) = @_; 3041 my ($self, $x, $y) = @_;
2590 3042
2591 ($x, $y) 3043 ($x, $y)
2592} 3044}
2593 3045
3046sub coord2global {
3047 my ($self, $x, $y) = @_;
3048
3049 ($x, $y)
3050}
3051
2594sub update { 3052sub update {
2595 my ($self) = @_; 3053 my ($self) = @_;
2596 3054
2597 $self->check_size; 3055 $::WANT_REFRESH++;
2598 ::refresh ();
2599} 3056}
2600 3057
2601sub add { 3058sub add {
2602 my ($self, $child) = @_; 3059 my ($self, @children) = @_;
2603 3060
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1;
3063
2604 # integerize window positions 3064 # integerise window positions
2605 $child->{x} = int $child->{x}; 3065 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 3066 $child->{y} = int $child->{y};
3067 }
2607 3068
2608 $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 }
2609} 3082}
2610 3083
2611sub on_refresh { 3084sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3085 my ($self, $id, $cb) = @_;
2613 3086
2614 $self->{refresh_hook}{$id} = $cb; 3087 $self->{refresh_hook}{$id} = $cb;
2615} 3088}
2616 3089
3090sub on_post_alloc {
3091 my ($self, $id, $cb) = @_;
3092
3093 $self->{post_alloc_hook}{$id} = $cb;
3094}
3095
2617sub draw { 3096sub draw {
2618 my ($self) = @_; 3097 my ($self) = @_;
2619 3098
2620 while (my $rcb = delete $self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
2621 $_->() 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}};
2622 } 3154 }
2623 3155
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3156 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3158 glClear GL_COLOR_BUFFER_BIT;
2627 3159
2628 glMatrixMode GL_PROJECTION; 3160 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3161 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3163 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3164 glLoadIdentity;
2633 3165
2634 $self->_draw; 3166 $self->_draw;
2635} 3167}
2636 3168
2637############################################################################# 3169#############################################################################
2638 3170
2639package CFClient::UI::InventoryItem;
2640
2641our @ISA = CFClient::UI::HBox::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my %args = @_;
2647
2648 my $item = $args{item};
2649
2650 my $desc = $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} $item->{name_pl}";
2653
2654
2655 my $self = $class->SUPER::new (
2656 can_hover => 1,
2657 can_events => 1,
2658 tooltip => (CFClient::UI::Label->escape ($desc)
2659 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2660 connect_button_down => sub {
2661 my ($self, $ev, $x, $y) = @_;
2662
2663 # todo: maybe put examine on 1? but should just be a tooltip :(
2664 if ($ev->{button} == 1) {
2665 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2666 } elsif ($ev->{button} == 2) {
2667 $::CONN->send ("apply $item->{tag}");
2668 } elsif ($ev->{button} == 3) {
2669 CFClient::UI::Menu->new (
2670 items => [
2671 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2672 [
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2674 sub { $::CONN->send ("lock $item->{tag}") },
2675 ],
2676 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2677 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2678 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2679 ],
2680 )->popup ($ev);
2681 }
2682
2683 1
2684 },
2685 %args
2686 );
2687 $self->add(new CFClient::UI::Face
2688 can_events => 0,
2689 face => $item->{face},
2690 anim => $item->{anim},
2691 animspeed => $item->{animspeed});
2692 $self->add(new CFClient::UI::Label
2693 can_events => 0,
2694 text => $desc);
2695
2696 $self
2697}
2698
2699#############################################################################
2700
2701package CFClient::UI::Inventory;
2702
2703our @ISA = CFClient::UI::ScrolledWindow::;
2704
2705sub new {
2706 my $class = shift;
2707
2708 my $self = $class->SUPER::new (
2709 scrolled => (new CFClient::UI::VBox),
2710 @_,
2711 );
2712
2713 $self
2714}
2715
2716sub set_items {
2717 my ($self, $items) = @_;
2718
2719 $self->{scrolled}->clear;
2720 return unless $items;
2721
2722 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2723
2724 $self->{real_items} = \@items;
2725
2726 for my $item (@items) {
2727 my $desc = $item->{nrof} < 2
2728 ? $item->{name}
2729 : "$item->{nrof} $item->{name_pl}";
2730
2731 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2732 }
2733
2734# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2735}
2736
2737sub size_request {
2738 my ($self) = @_;
2739 ($self->{req_w}, $self->{req_h});
2740}
2741
2742#############################################################################
2743
2744package CFClient::UI; 3171package CFClient::UI;
2745 3172
2746$ROOT = new CFClient::UI::Root; 3173$ROOT = new CFClient::UI::Root;
2747$TOOLTIP = new CFClient::UI::Tooltip; 3174$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2748 3175
27491 31761
2750 3177

Diff Legend

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