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

Diff Legend

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