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.158 by root, Mon Apr 24 02:41:48 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;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
20 43
21 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 45 $TOOLTIP->{owner} = $widget;
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_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->realloc;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
35 } 65 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
45} 76}
46 77
47sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
49} 81}
50 82
51sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
52 my ($ev) = @_; 84 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 93 check_tooltip;
62 } 94 }
63 95
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 97
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
67} 100}
68 101
69sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
70 my ($ev) = @_; 103 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
72 105
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 107
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 109
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
78 112
79 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 115 $grab->update if $grab;
82 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 133
100 check_tooltip; 134 check_tooltip;
101 } 135 }
102 136
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
104} 139}
105 140
106# convert position array to integers 141# convert position array to integers
107sub harmonize { 142sub harmonize {
108 my ($vals) = @_; 143 my ($vals) = @_;
… …
114 $rem += $_ - $i; 149 $rem += $_ - $i;
115 $_ = $i; 150 $_ = $i;
116 } 151 }
117} 152}
118 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;
186}
187
119############################################################################# 188#############################################################################
120 189
121package CFClient::UI::Base; 190package CFClient::UI::Base;
122 191
123use strict; 192use strict;
… …
126 195
127sub new { 196sub new {
128 my $class = shift; 197 my $class = shift;
129 198
130 my $self = bless { 199 my $self = bless {
131 x => 0, 200 x => 0,
132 y => 0, 201 y => 0,
133 z => 0, 202 z => 0,
134 can_events => 1, 203 can_events => 1,
135 @_ 204 @_
136 }, $class; 205 }, $class;
137 206
138 for (keys %$self) { 207 for (keys %$self) {
139 if (/^connect_(.*)$/) { 208 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 209 $self->connect ($1 => delete $self->{$_});
141 } 210 }
142 } 211 }
143 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
144 $self 222 $self
145} 223}
146 224
225sub destroy {
226 my ($self) = @_;
227
228 $self->hide;
229 %$self = ();
230}
231
147sub show { 232sub show {
148 my ($self) = @_; 233 my ($self) = @_;
149 234
150 return if $self->{parent}; 235 return if $self->{parent};
151 236
152 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
153} 238}
154 239
240sub center {
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};
276
277 undef $GRAB if $GRAB == $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
155sub hide { 305sub hide {
156 my ($self) = @_; 306 my ($self) = @_;
157 307
158 return unless $self->{parent}; 308 $self->set_invisible;
159 309
160 $self->{parent}->remove ($self); 310 $self->{parent}->remove ($self)
311 if $self->{parent};
161} 312}
162 313
163sub move { 314sub move {
164 my ($self, $x, $y, $z) = @_; 315 my ($self, $x, $y, $z) = @_;
165 316
… …
171} 322}
172 323
173sub set_size { 324sub set_size {
174 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
175 326
176 $self->{user_w} = $w; 327 $self->{def_w} = $w;
177 $self->{user_h} = $h; 328 $self->{def_h} = $h;
178 329
179 $self->check_size; 330 $self->realloc;
180} 331}
181 332
182sub size_request { 333sub size_request {
183 require Carp; 334 require Carp;
184 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
204 $self->{y} = $y; 355 $self->{y} = $y;
205 $self->update; 356 $self->update;
206 } 357 }
207 358
208 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
209 $self->{w} = $w; 360 return unless $self->{visible};
210 $self->{h} = $h;
211 361
212 $self->size_allocate ($w, $h); 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
213 $self->update;
214 } 363 }
215} 364}
216 365
217sub size_allocate { 366sub size_allocate {
218 # nothing to be done 367 # nothing to be done
219} 368}
220 369
370sub children {
371}
372
221sub set_max_size { 373sub set_max_size {
222 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
223 375
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 376 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 377 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 378}
227 379
228# return top left coordinates 380sub set_tooltip {
229sub _topleft {
230 my ($self, $x, $y) = @_; 381 my ($self, $tooltip) = @_;
231 382
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 383 $tooltip =~ s/^\s+//;
384 $tooltip =~ s/\s+$//;
385
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 }
233} 394}
234 395
235# translate global coordinates to local coordinate system 396# translate global coordinates to local coordinate system
236sub coord2local { 397sub coord2local {
237 my ($self, $x, $y) = @_; 398 my ($self, $x, $y) = @_;
238 399
239 my ($X, $Y) = $self->_topleft; 400 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 401}
242 402
243# translate local coordinates to global coordinate system 403# translate local coordinates to global coordinate system
244sub coord2global { 404sub coord2global {
245 my ($self, $x, $y) = @_; 405 my ($self, $x, $y) = @_;
246 406
247 my ($X, $Y) = $self->_topleft; 407 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 408}
250 409
251sub focus_in { 410sub focus_in {
252 my ($self) = @_; 411 my ($self) = @_;
253 412
254 return if $FOCUS == $self; 413 return if $FOCUS == $self;
255 return unless $self->{can_focus}; 414 return unless $self->{can_focus};
256 415
257 my $focus = $FOCUS; $FOCUS = $self; 416 my $focus = $FOCUS; $FOCUS = $self;
258 417
259 $self->emit (focus_in => $focus); 418 $self->_emit (focus_in => $focus);
260 419
261 $focus->update if $focus; 420 $focus->update if $focus;
262 $FOCUS->update; 421 $FOCUS->update;
263} 422}
264 423
… …
267 426
268 return unless $FOCUS == $self; 427 return unless $FOCUS == $self;
269 428
270 my $focus = $FOCUS; undef $FOCUS; 429 my $focus = $FOCUS; undef $FOCUS;
271 430
272 $self->emit (focus_out => $focus); 431 $self->_emit (focus_out => $focus);
273 432
274 $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;
275} 437}
276 438
277sub mouse_motion { } 439sub mouse_motion { }
278sub button_up { } 440sub button_up { }
279sub key_down { } 441sub key_down { }
280sub key_up { } 442sub key_up { }
281 443
282sub button_down { 444sub button_down {
283 my ($self, $ev, $x, $y) = @_; 445 my ($self, $ev, $x, $y) = @_;
284 446
285 $self->focus_in; 447 $self->focus_in;
… …
288sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
289sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
290sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
291sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
292sub 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}
293 518
294sub draw { 519sub draw {
295 my ($self) = @_; 520 my ($self) = @_;
296 521
297 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 538 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 539 glVertex $x , $y + $self->{h};
315 glEnd; 540 glEnd;
316 glDisable GL_BLEND; 541 glDisable GL_BLEND;
317 } 542 }
543
544 if ($ENV{PCLIENT_DEBUG}) {
545 glPushMatrix;
546 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
548 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1;
553 glEnd;
554 glPopMatrix;
555 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
556 }
318} 557}
319 558
320sub _draw { 559sub _draw {
321 my ($self) = @_; 560 my ($self) = @_;
322 561
323 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
324} 563}
325 564
326sub find_widget {
327 my ($self, $x, $y) = @_;
328
329 return () unless $self->{can_events};
330
331 return $self
332 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
333 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
334
335 ()
336}
337
338sub set_parent {
339 my ($self, $parent) = @_;
340
341 Scalar::Util::weaken ($self->{parent} = $parent);
342}
343
344sub check_size {
345 my ($self) = @_;
346
347 $self->{parent}
348 or return 1;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368}
369
370sub update {
371 my ($self) = @_;
372
373 $self->{parent}->update
374 if $self->{parent};
375}
376
377sub connect {
378 my ($self, $signal, $cb) = @_;
379
380 push @{ $self->{signal_cb}{$signal} }, $cb;
381}
382
383sub emit {
384 my ($self, $signal, @args) = @_;
385
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
387 $cb->($self, @args);
388 }
389}
390
391sub DESTROY { 565sub DESTROY {
392 my ($self) = @_; 566 my ($self) = @_;
393 567
568 delete $WIDGET{$self+0};
394 #$self->deactivate; 569 #$self->deactivate;
395} 570}
396 571
397############################################################################# 572#############################################################################
398 573
… …
407 my $class = shift; 582 my $class = shift;
408 583
409 # range [value, low, high, page] 584 # range [value, low, high, page]
410 585
411 $class->SUPER::new ( 586 $class->SUPER::new (
412 bg => [0, 0, 0, 0.2], 587 #bg => [0, 0, 0, 0.2],
413 active_bg => [1, 1, 1, 0.5], 588 #active_bg => [1, 1, 1, 0.5],
414 @_ 589 @_
415 ) 590 )
416} 591}
417 592
418sub _draw { 593sub _draw {
419 my ($self) = @_; 594 my ($self) = @_;
420 595
596 my $color = $FOCUS == $self && $self->{active_bg}
597 ? $self->{active_bg}
598 : $self->{bg};
599
600 if ($color && (@$color < 4 || $color->[3])) {
421 my ($w, $h) = @$self{qw(w h)}; 601 my ($w, $h) = @$self{qw(w h)};
422 602
423 glEnable GL_BLEND; 603 glEnable GL_BLEND;
424 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 605 glColor @$color;
426 606
427 glBegin GL_QUADS; 607 glBegin GL_QUADS;
428 glVertex 0 , 0; 608 glVertex 0 , 0;
429 glVertex 0 , $h; 609 glVertex 0 , $h;
430 glVertex $w, $h; 610 glVertex $w, $h;
431 glVertex $w, 0; 611 glVertex $w, 0;
432 glEnd; 612 glEnd;
433 613
434 glDisable GL_BLEND; 614 glDisable GL_BLEND;
615 }
435} 616}
436 617
437############################################################################# 618#############################################################################
438 619
439package CFClient::UI::Empty; 620package CFClient::UI::Empty;
… …
460sub new { 641sub new {
461 my ($class, %arg) = @_; 642 my ($class, %arg) = @_;
462 643
463 my $children = delete $arg{children} || []; 644 my $children = delete $arg{children} || [];
464 645
465 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 646 my $self = $class->SUPER::new (
647 children => [],
648 can_events => 0,
649 %arg,
650 );
466 $self->add ($_) for @$children; 651 $self->add ($_) for @$children;
467 652
468 $self 653 $self
469} 654}
470 655
471sub add { 656sub add {
472 my ($self, $child) = @_; 657 my ($self, @widgets) = @_;
473 658
474 $child->set_parent ($self); 659 $_->set_parent ($self)
660 for @widgets;
475 661
476 use sort 'stable'; 662 use sort 'stable';
477 663
478 $self->{children} = [ 664 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 666 @{$self->{children}}, @widgets
481 ]; 667 ];
482 668
483 $child->check_size; 669 $self->realloc;
670}
671
672sub children {
673 @{ $_[0]{children} }
484} 674}
485 675
486sub remove { 676sub remove {
487 my ($self, $child) = @_; 677 my ($self, $child) = @_;
488 678
489 delete $child->{parent}; 679 delete $child->{parent};
680 $child->hide;
490 681
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492 683
493 $self->check_size; 684 $self->realloc;
494 $self->update; 685}
686
687sub clear {
688 my ($self) = @_;
689
690 my $children = delete $self->{children};
691 $self->{children} = [];
692
693 for (@$children) {
694 delete $_->{parent};
695 $_->hide;
696 }
697
698 $self->realloc;
495} 699}
496 700
497sub find_widget { 701sub find_widget {
498 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
499 703
… …
552sub size_request { 756sub size_request {
553 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
554} 758}
555 759
556sub size_allocate { 760sub size_allocate {
557 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
558 762
559 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
560} 764}
561 765
562############################################################################# 766#############################################################################
… …
574} 778}
575 779
576sub update { 780sub update {
577 my ($self) = @_; 781 my ($self) = @_;
578 782
579 # we want to do this delayed... 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 784 $self->SUPER::update;
582} 785}
583 786
787sub size_allocate {
788 my ($self, $w, $h, $changed) = @_;
789
790 $self->SUPER::size_allocate ($w, $h, $changed);
791 $self->update
792 if $changed;
793}
794
795sub _render {
796 $_[0]{children}[0]->draw;
797}
798
584sub render_chld { 799sub render_child {
585 my ($self) = @_; 800 my ($self) = @_;
586 801
587 $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 {
588 glClearColor 0, 0, 0, 1; 803 glClearColor 0, 0, 0, 0;
589 glClear GL_COLOR_BUFFER_BIT; 804 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw; 805
806 $self->_render;
591 }; 807 };
592}
593
594sub size_allocate {
595 my ($self, $w, $h) = @_;
596
597 $self->child->configure (0, 0, $w, $h);
598
599 $self->render_chld;
600} 808}
601 809
602sub _draw { 810sub _draw {
603 my ($self) = @_; 811 my ($self) = @_;
604 812
605 my ($w, $h) = ($self->w, $self->h); 813 my ($w, $h) = ($self->w, $self->h);
606 814
607 my $tex = $self->{texture} 815 my $tex = $self->{texture}
608 or return; 816 or return;
609 817
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1;
614 821
615 $tex->draw_quad (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 823
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
619} 825}
620 826
621############################################################################# 827#############################################################################
622 828
623package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
624 830
625our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
626
627sub new { die }
628
629sub size_request {
630 my ($self) = @_;
631
632 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
634
635 @$self{qw(child_w child_h)}
636}
637
638sub _draw {
639 my ($self) = @_;
640
641 $self->{children}[1]->draw;
642}
643
644
645#############################################################################
646
647package CFClient::UI::Frame;
648
649our @ISA = CFClient::UI::Bin::;
650
651use CFClient::OpenGL;
652 832
653sub new { 833sub new {
654 my $class = shift; 834 my $class = shift;
655 835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
843sub size_request {
844 my ($self) = @_;
845
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
847
848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
852}
853
854sub size_allocate {
855 my ($self, $w, $h, $changed) = @_;
856
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
860 $self->child->configure (0, 0, $w, $h);
861 $self->update;
862}
863
864sub set_offset {
865 my ($self, $x, $y) = @_;
866
867 $self->{view_x} = int $x;
868 $self->{view_y} = int $y;
869
870 $self->update;
871}
872
873# hmm, this does not work for topleft of $self... but we should not ask for that
874sub coord2local {
875 my ($self, $x, $y) = @_;
876
877 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
878}
879
880sub coord2global {
881 my ($self, $x, $y) = @_;
882
883 $x = List::Util::min $self->{w}, $x - $self->{view_x};
884 $y = List::Util::min $self->{h}, $y - $self->{view_y};
885
886 $self->SUPER::coord2global ($x, $y)
887}
888
889sub find_widget {
890 my ($self, $x, $y) = @_;
891
892 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
893 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
894 ) {
895 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
896 } else {
897 $self->CFClient::UI::Base::find_widget ($x, $y)
898 }
899}
900
901sub _render {
902 my ($self) = @_;
903
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905
906 $self->SUPER::_render;
907}
908
909#############################################################################
910
911package CFClient::UI::ScrolledWindow;
912
913our @ISA = CFClient::UI::HBox::;
914
915sub new {
916 my $class = shift;
917
918 my $self;
919
920 my $slider = new CFClient::UI::Slider
921 vertical => 1,
922 range => [0, 0, 1, 0.01], # HACK fix
923 on_changed => sub {
924 $self->{vp}->set_offset (0, $_[1]);
925 },
926 ;
927
656 my $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
657 bg => [1, 1, 1, 1], 929 vp => (new CFClient::UI::ViewPort expand => 1),
658 border_bg => [1, 1, 1, 1], 930 slider => $slider,
659 border => 0.8,
660 @_ 931 @_,
661 ); 932 );
662 933
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider});
937
663 $self 938 $self
664} 939}
665 940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
951sub size_allocate {
952 my ($self, $w, $h, $changed) = @_;
953
954 $self->SUPER::size_allocate ($w, $h, $changed);
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll
962
963#############################################################################
964
965package CFClient::UI::Frame;
966
967our @ISA = CFClient::UI::Bin::;
968
969use CFClient::OpenGL;
970
971sub new {
972 my $class = shift;
973
974 $class->SUPER::new (
975 bg => undef,
976 @_,
977 )
978}
979
666sub _draw { 980sub _draw {
667 my ($self) = @_; 981 my ($self) = @_;
668 982
669 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
670 985
671 glEnable GL_BLEND; 986 glEnable GL_BLEND;
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 989
676# glBegin GL_QUADS; 990 glBegin GL_QUADS;
677# glColor 0, 0, 0, 0;
678# glVertex 0 , 0; 991 glVertex 0 , 0;
679# glVertex 0 , $h; 992 glVertex 0 , $h;
680# glVertex $w, $h; 993 glVertex $w, $h;
681# glVertex $w, 0; 994 glVertex $w, 0;
682# glEnd; 995 glEnd;
683 996
684
685 $self->child->draw;
686 glDisable GL_BLEND; 997 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
688} 1001}
689 1002
690############################################################################# 1003#############################################################################
691 1004
692package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
700 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);
701 1014
702sub new { 1015sub new {
703 my $class = shift; 1016 my $class = shift;
704 1017
705 # TODO: user_x, user_y, overwrite moveto?
706
707 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
710 border => 0.8, 1021 border => 0.6,
1022 is_toplevel => 1,
711 can_events => 1, 1023 can_events => 1,
712 @_ 1024 @_
713 ); 1025 );
714 1026
715 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 1028 align => 0,
717 valign => 1, 1029 valign => 1,
718 text => $self->{title}, 1030 text => $self->{title},
719 fontsize => 1; 1031 fontsize => $self->{border};
720 1032
721 $self 1033 $self
722} 1034}
723 1035
724sub border { 1036sub border {
… …
735 $h + $self->border * 2, 1047 $h + $self->border * 2,
736 ) 1048 )
737} 1049}
738 1050
739sub size_allocate { 1051sub size_allocate {
740 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
741 1055
742 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
744 1058
745 $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)
746 if $self->{title}; 1060 if $self->{title};
747 1061
748 $self->child->configure ($self->border, $self->border, $w, $h); 1062 $self->child->configure ($self->border, $self->border, $w, $h);
749} 1063}
750 1064
751sub button_down { 1065sub button_down {
752 my ($self, $ev, $x, $y) = @_; 1066 my ($self, $ev, $x, $y) = @_;
753 1067
1068 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 1069 my $border = $self->border;
755 1070
756 if ($x < $self->{w} && $x >= $self->{w} - $border 1071 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 1072 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 1073
1074 if ($lr & $td) {
1075 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1076 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 1077 my ($bw, $bh) = ($self->{w}, $self->{h});
761 1078
1079 my $mx = $x < $border;
1080 my $my = $y < $border;
1081
762 $self->{motion} = sub { 1082 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
764 1084
765 ($x, $y) = ($ev->{x}, $ev->{y}); 1085 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy;
766 1087
767 $self->{user_w} = $bw + $x - $ox; 1088 $self->{user_x} = $wx + $dx * $mx;
768 $self->{user_h} = $bh + $y - $oy; 1089 $self->{user_y} = $wy + $dy * $my;
769 $self->check_size; 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y});
1093 $self->realloc;
770 }; 1094 };
771 1095
772 } elsif ($x >= 0 && $x < $self->{w} 1096 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
777 1099
778 $self->{motion} = sub { 1100 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
780 1102
781 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
782 1104
783 $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});
784 $self->update; 1109 $self->realloc;
785 }; 1110 };
786 } 1111 }
787} 1112}
788 1113
789sub button_up { 1114sub button_up {
… …
802 my ($self) = @_; 1127 my ($self) = @_;
803 1128
804 my ($w, $h ) = ($self->{w}, $self->{h}); 1129 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 1131
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 1132 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 1134
812 my $border = $self->border; 1135 my $border = $self->border;
813 1136
814 glColor @{ $self->{border_bg} }; 1137 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819 1142
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820 my $bg = $tex[0]; 1144 my $bg = $tex[0];
821 1145
822 # TODO: repeat texture not scale 1146 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 1147 my $rep_x = $cw / $bg->{w};
824 my $rep_y = $ch / $bg->{h}; 1148 my $rep_y = $ch / $bg->{h};
825 1149
826 glColor @{ $self->{bg} }; 1150 glColor @{ $self->{bg} };
827 1151
828 $bg->{s} = $rep_x; 1152 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y; 1153 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1; 1154 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 }
832 1157
833 glDisable GL_TEXTURE_2D; 1158 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 1159
836 $self->{title}->draw if $self->{title}; 1160 $self->{title}->draw if $self->{title};
1161
837 $self->child->draw; 1162 $self->child->draw;
838} 1163}
839 1164
840############################################################################# 1165#############################################################################
841 1166
… …
850sub new { 1175sub new {
851 my $class = shift; 1176 my $class = shift;
852 1177
853 $class->SUPER::new ( 1178 $class->SUPER::new (
854 col_expand => [], 1179 col_expand => [],
855 @_ 1180 @_,
856 ) 1181 )
1182}
1183
1184sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} }
857} 1186}
858 1187
859sub add { 1188sub add {
860 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
861 1190
862 $child->set_parent ($self); 1191 $child->set_parent ($self);
863 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
864 1193
865 $child->check_size; 1194 $self->realloc;
866} 1195}
867 1196
868# 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?
869sub clear { 1198sub clear {
870 my ($self) = @_; 1199 my ($self) = @_;
871 1200
1201 my @children = $self->children;
872 delete $self->{children}; 1202 delete $self->{children};
873 $self->update; 1203
1204 for (@children) {
1205 delete $_->{parent};
1206 $_->hide;
1207 }
1208
1209 $self->realloc;
874} 1210}
875 1211
876sub get_wh { 1212sub get_wh {
877 my ($self) = @_; 1213 my ($self) = @_;
878 1214
… …
905 (sum @$hs), 1241 (sum @$hs),
906 ) 1242 )
907} 1243}
908 1244
909sub size_allocate { 1245sub size_allocate {
910 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
911 1247
912 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
913 1249
914 my $req_w = sum @$ws; 1250 my $req_w = (sum @$ws) || 1;
915 my $req_h = sum @$hs; 1251 my $req_h = (sum @$hs) || 1;
916 1252
917 # TODO: nicer code && do row_expand 1253 # TODO: nicer code && do row_expand
918 my @col_expand = @{$self->{col_expand}}; 1254 my @col_expand = @{$self->{col_expand}};
919 @col_expand = (1) x @$ws unless @col_expand; 1255 @col_expand = (1) x @$ws unless @col_expand;
920 my $col_expand = (sum @col_expand) || 1; 1256 my $col_expand = (sum @col_expand) || 1;
… …
974 } 1310 }
975} 1311}
976 1312
977############################################################################# 1313#############################################################################
978 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
979package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
980 1376
981# TODO: wrap into common Box base class
982
983our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
984 1378
985sub size_request { 1379sub new {
986 my ($self) = @_; 1380 my $class = shift;
987 1381
988 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
989 1383 vertical => 0,
990 ( 1384 @_,
991 (List::Util::sum map $_->[0], @alloc),
992 (List::Util::max map $_->[1], @alloc),
993 ) 1385 )
994} 1386}
995 1387
996sub size_allocate {
997 my ($self, $w, $h) = @_;
998
999 ($h, $w) = ($w, $h);
1000
1001 my $children = $self->{children};
1002
1003 my @h = map $_->{req_w}, @$children;
1004
1005 my $req_h = List::Util::sum @h;
1006
1007 if ($req_h > $h) {
1008 # ah well, not enough space
1009 $_ *= $h / $req_h for @h;
1010 } else {
1011 my $exp = List::Util::sum map $_->{expand}, @$children;
1012 $exp ||= 1;
1013
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016
1017 my $alloc_h = $h[$_];
1018 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1019 $h[$_] = $alloc_h;
1020 }
1021 }
1022
1023 CFClient::UI::harmonize \@h;
1024
1025 my $y = 0;
1026 for (0 .. $#$children) {
1027 my $child = $children->[$_];
1028 my $h = $h[$_];
1029 $child->configure ($y, 0, $h, $w);
1030
1031 $y += $h;
1032 }
1033
1034 1
1035}
1036
1037############################################################################# 1388#############################################################################
1038 1389
1039package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1040 1391
1041# TODO: wrap into common Box base class
1042
1043our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1044 1393
1045sub size_request { 1394sub new {
1046 my ($self) = @_; 1395 my $class = shift;
1047 1396
1048 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1049 1398 vertical => 1,
1050 ( 1399 @_,
1051 (List::Util::max map $_->[0], @alloc),
1052 (List::Util::sum map $_->[1], @alloc),
1053 ) 1400 )
1054} 1401}
1055 1402
1056sub size_allocate {
1057 my ($self, $w, $h) = @_;
1058
1059 my $children = $self->{children};
1060
1061 my @h = map $_->{req_h}, @$children;
1062
1063 my $req_h = List::Util::sum @h;
1064
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } else {
1069 my $exp = List::Util::sum map $_->{expand}, @$children;
1070 $exp ||= 1;
1071
1072 for (0 .. $#$children) {
1073 my $child = $children->[$_];
1074
1075 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1076 }
1077 }
1078
1079 CFClient::UI::harmonize \@h;
1080
1081 my $y = 0;
1082 for (0 .. $#$children) {
1083 my $child = $children->[$_];
1084 my $h = $h[$_];
1085 $child->configure (0, $y, $w, $h);
1086
1087 $y += $h;
1088 }
1089
1090 1
1091}
1092
1093############################################################################# 1403#############################################################################
1094 1404
1095package CFClient::UI::Label; 1405package CFClient::UI::Label;
1096 1406
1097our @ISA = CFClient::UI::Base::; 1407our @ISA = CFClient::UI::DrawBG::;
1098 1408
1099use CFClient::OpenGL; 1409use CFClient::OpenGL;
1100 1410
1101sub new { 1411sub new {
1102 my ($class, %arg) = @_; 1412 my ($class, %arg) = @_;
1103 1413
1104 my $self = $class->SUPER::new ( 1414 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1415 fg => [1, 1, 1],
1416 #bg => none
1417 #active_bg => none
1106 #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),
1107 fontsize => 1, 1424 fontsize => 1,
1108 text => "",
1109 align => -1, 1425 align => -1,
1110 valign => -1, 1426 valign => -1,
1111 padding => 2, 1427 padding => 2,
1112 layout => new CFClient::Layout,
1113 can_events => 0, 1428 can_events => 0,
1114 %arg 1429 %arg
1115 ); 1430 );
1116 1431
1117 if (exists $self->{template}) { 1432 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1433 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1434 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1435 $self->{template} = $layout;
1121 } 1436 }
1122 1437
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1438 if (exists $self->{markup}) {
1124 $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 }
1125 1443
1126 $self 1444 $self
1127} 1445}
1128 1446
1129sub escape_text { 1447sub escape($) {
1130 local $_ = $_[1]; 1448 local $_ = $_[0];
1131 1449
1132 s/&/&amp;/g; 1450 s/&/&amp;/g;
1133 s/>/&gt;/g; 1451 s/>/&gt;/g;
1134 s/</&lt;/g; 1452 s/</&lt;/g;
1135 1453
1136 $_[1] 1454 $_
1455}
1456
1457sub update {
1458 my ($self) = @_;
1459
1460 delete $self->{texture};
1461 $self->SUPER::update;
1137} 1462}
1138 1463
1139sub set_text { 1464sub set_text {
1140 my ($self, $text) = @_; 1465 my ($self, $text) = @_;
1141 1466
1467 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text";
1469
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1143 1472
1144 delete $self->{texture}; 1473 $self->realloc;
1145 $self->check_size;
1146 $self->update;
1147} 1474}
1148 1475
1149sub set_markup { 1476sub set_markup {
1150 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1151 1478
1479 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup";
1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1153 1486
1154 delete $self->{texture}; 1487 $self->realloc;
1155 $self->check_size;
1156 $self->update;
1157} 1488}
1158 1489
1159sub size_request { 1490sub size_request {
1160 my ($self) = @_; 1491 my ($self) = @_;
1161 1492
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $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});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1498
1166 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1167 1500
1168 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
… …
1180 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1181 ) 1514 )
1182} 1515}
1183 1516
1184sub size_allocate { 1517sub size_allocate {
1185 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1186 1519
1187 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1188} 1522}
1189 1523
1190sub set_fontsize { 1524sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1192 1526
1193 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1528 delete $self->{texture};
1195 $self->check_size; 1529
1196 $self->update; 1530 $self->realloc;
1197} 1531}
1198 1532
1199sub _draw { 1533sub _draw {
1200 my ($self) = @_; 1534 my ($self) = @_;
1201 1535
1536 $self->SUPER::_draw; # draw background, if applicable
1537
1202 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $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});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545
1206 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
1207 }; 1557 };
1208 1558
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1561
1562 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1563 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $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 }
1229 1568
1230 glDisable GL_TEXTURE_2D; 1569 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1570}
1233 1571
1234############################################################################# 1572#############################################################################
1235 1573
1236package CFClient::UI::EntryBase; 1574package CFClient::UI::EntryBase;
… …
1241 1579
1242sub new { 1580sub new {
1243 my $class = shift; 1581 my $class = shift;
1244 1582
1245 $class->SUPER::new ( 1583 $class->SUPER::new (
1246 fg => [1, 1, 1], 1584 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1585 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1586 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1250 can_hover => 1, 1588 can_hover => 1,
1251 can_focus => 1, 1589 can_focus => 1,
1252 valign => 0, 1590 valign => 0,
1253 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1254 @_ 1593 @_
1255 ) 1594 )
1256} 1595}
1257 1596
1258sub _set_text { 1597sub _set_text {
… …
1268 $self->{text} = $text; 1607 $self->{text} = $text;
1269 1608
1270 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1272 1611
1273 $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;
1274} 1622}
1275 1623
1276sub get_text { 1624sub get_text {
1277 $_[0]{text} 1625 $_[0]{text}
1278} 1626}
… …
1281 my ($self) = @_; 1629 my ($self) = @_;
1282 1630
1283 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1284 1632
1285 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1286}
1287
1288sub size_allocate {
1289 my ($self, $w, $h) = @_;
1290
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text {
1295 my ($self, $text) = @_;
1296
1297 $self->{cursor} = length $text;
1298 $self->_set_text ($text);
1299 $self->update;
1300} 1634}
1301 1635
1302sub key_down { 1636sub key_down {
1303 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1304 1638
… …
1306 my $sym = $ev->{sym}; 1640 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1641 my $uni = $ev->{unicode};
1308 1642
1309 my $text = $self->get_text; 1643 my $text = $self->get_text;
1310 1644
1311 if ($sym == 8) { 1645 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1646 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1647 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1648 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1649 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1650 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1651 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1652 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1657 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1658 $self->_emit ('escape');
1325 } elsif ($uni) { 1659 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1661 }
1328 1662
1329 $self->_set_text ($text); 1663 $self->_set_text ($text);
1330 $self->update; 1664
1665 $self->realloc;
1331} 1666}
1332 1667
1333sub focus_in { 1668sub focus_in {
1334 my ($self) = @_; 1669 my ($self) = @_;
1335 1670
… …
1411 my ($self, $ev) = @_; 1746 my ($self, $ev) = @_;
1412 1747
1413 my $sym = $ev->{sym}; 1748 my $sym = $ev->{sym};
1414 1749
1415 if ($sym == 13) { 1750 if ($sym == 13) {
1751 unshift @{$self->{history}},
1752 my $txt = $self->get_text;
1753 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1755 $self->_emit (activate => $txt);
1417 $self->update; 1756 $self->update;
1757
1758 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text;
1761 }
1762 if (@{$self->{history} || []} > 0) {
1763 $self->{history_pointer}++;
1764 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1765 $self->{history_pointer} = @{$self->{history} || []} - 1;
1766 }
1767 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1768 }
1769
1770 } elsif ($sym == CFClient::SDLK_DOWN) {
1771 $self->{history_pointer}--;
1772 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1773
1774 if ($self->{history_pointer} >= 0) {
1775 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1776 } else {
1777 $self->set_text ($self->{history_saveback});
1778 }
1418 1779
1419 } else { 1780 } else {
1420 $self->SUPER::key_down ($ev); 1781 $self->SUPER::key_down ($ev);
1421 } 1782 }
1422 1783
… …
1436 1797
1437sub new { 1798sub new {
1438 my $class = shift; 1799 my $class = shift;
1439 1800
1440 $class->SUPER::new ( 1801 $class->SUPER::new (
1441 padding => 4, 1802 padding => 4,
1442 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1445 can_hover => 1, 1805 can_hover => 1,
1446 align => 0, 1806 align => 0,
1447 valign => 0, 1807 valign => 0,
1448 can_events => 1, 1808 can_events => 1,
1449 @_ 1809 @_
1450 ) 1810 )
1451} 1811}
1452 1812
1813sub activate { }
1814
1453sub button_up { 1815sub button_up {
1454 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1455 1817
1818 $self->emit ("activate")
1456 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1457 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1458 $self->emit ("activate");
1459 }
1460} 1821}
1461 1822
1462sub _draw { 1823sub _draw {
1463 my ($self) = @_; 1824 my ($self) = @_;
1464 1825
… …
1466 1827
1467 if ($GRAB == $self) { 1828 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1829 $self->{fg} = $self->{active_fg};
1469 } 1830 }
1470 1831
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1834 glColor 0, 0, 0, 1;
1476 1835
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1836 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1837
1479 glDisable GL_TEXTURE_2D; 1838 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1839
1482 $self->SUPER::_draw; 1840 $self->SUPER::_draw;
1483} 1841}
1484 1842
1485############################################################################# 1843#############################################################################
… …
1499 1857
1500 $class->SUPER::new ( 1858 $class->SUPER::new (
1501 padding => 2, 1859 padding => 2,
1502 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1503 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],
1504 state => 0, 1864 state => 0,
1505 can_hover => 1, 1865 can_hover => 1,
1506 @_ 1866 @_
1507 ) 1867 )
1508} 1868}
… …
1517 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1518 1878
1519 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1520 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1521 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1522 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1523 } 1883 }
1524} 1884}
1525 1885
1526sub _draw { 1886sub _draw {
1527 my ($self) = @_; 1887 my ($self) = @_;
… …
1532 1892
1533 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;
1534 1894
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1896
1537 glEnable GL_BLEND; 1897 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898
1538 glEnable GL_TEXTURE_2D; 1899 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1900 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1901 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1902}
1548 1903
1549############################################################################# 1904#############################################################################
1550 1905
1551package CFClient::UI::Image; 1906package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1949 glTranslate 0, -$self->{w}, 0;
1595 1950
1596 ($w, $h) = ($h, $w); 1951 ($w, $h) = ($h, $w);
1597 } 1952 }
1598 1953
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1954 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1956
1604 $tex->draw_quad (0, 0, $w, $h); 1957 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1958
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1959 glDisable GL_TEXTURE_2D;
1608} 1960}
1609 1961
1610############################################################################# 1962#############################################################################
1611 1963
… …
1659} 2011}
1660 2012
1661sub set_max { 2013sub set_max {
1662 my ($self, $max) = @_; 2014 my ($self, $max) = @_;
1663 2015
2016 return if $self->{max_val} == $max;
2017
1664 $self->{max_val} = $max; 2018 $self->{max_val} = $max;
2019 $self->update;
1665} 2020}
1666 2021
1667sub set_value { 2022sub set_value {
1668 my ($self, $val, $max) = @_; 2023 my ($self, $val, $max) = @_;
1669 2024
1670 $self->set_max ($max) 2025 $self->set_max ($max)
1671 if defined $max; 2026 if defined $max;
1672 2027
1673 $max = $self->{max_val}; 2028 return if $self->{val} == $val;
2029
1674 $self->{val} = $val; 2030 $self->{val} = $val;
1675
1676 $self->update; 2031 $self->update;
1677} 2032}
1678 2033
1679sub _draw { 2034sub _draw {
1680 my ($self) = @_; 2035 my ($self) = @_;
… …
1743 2098
1744sub new { 2099sub new {
1745 my ($class, %arg) = @_; 2100 my ($class, %arg) = @_;
1746 2101
1747 my $self = $class->SUPER::new ( 2102 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2103 tooltip => $arg{type},
2104 can_hover => 1,
2105 can_events => 1,
1749 %arg, 2106 %arg,
1750 ); 2107 );
1751 2108
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2109 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2110 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2111 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2112
1756 $self 2113 $self
1757} 2114}
1758 2115
1759sub set_fontsize { 2116sub set_fontsize {
… …
1761 2118
1762 $self->{value}->set_fontsize ($fsize); 2119 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2120 $self->{max} ->set_fontsize ($fsize);
1764} 2121}
1765 2122
2123sub set_max {
2124 my ($self, $max) = @_;
2125
2126 $self->{gauge}->set_max ($max);
2127 $self->{max}->set_text ($max);
2128}
2129
1766sub set_value { 2130sub set_value {
1767 my ($self, $val, $max) = @_; 2131 my ($self, $val, $max) = @_;
1768 2132
1769 $self->set_max ($max) 2133 $self->set_max ($max)
1770 if defined $max; 2134 if defined $max;
1771 2135
1772 $self->{gauge}->set_value ($val, $max); 2136 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2137 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 2138}
1782 2139
1783############################################################################# 2140#############################################################################
1784 2141
1785package CFClient::UI::Slider; 2142package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2152 qw(s1_slider.png s1_slider_bg.png);
1796 2153
1797sub new { 2154sub new {
1798 my $class = shift; 2155 my $class = shift;
1799 2156
1800 # range [value, low, high, page] 2157 # range [value, low, high, page, unit]
1801 2158
1802 # TODO: 0-width page 2159 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2160 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2161 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2162 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
1807 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],
1808 range => [0, 0, 100, 10], 2167 range => [0, 0, 100, 10, 0],
1809 req_w => 20, 2168 req_w => $::WIDTH / 80,
1810 req_h => 20, 2169 req_h => $::WIDTH / 80,
1811 vertical => 0, 2170 vertical => 0,
1812 can_hover => 1, 2171 can_hover => 1,
1813 inner_pad => 5, 2172 inner_pad => 0.02,
1814 @_ 2173 @_
1815 ); 2174 );
1816 2175
2176 $self->set_value ($self->{range}[0]);
2177 $self->update;
2178
1817 $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 }
1818} 2214}
1819 2215
1820sub size_request { 2216sub size_request {
1821 my ($self) = @_; 2217 my ($self) = @_;
1822 2218
… …
1828 2224
1829sub button_down { 2225sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 2226 my ($self, $ev, $x, $y) = @_;
1831 2227
1832 $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
1833 $self->mouse_motion ($ev, $x, $y); 2232 $self->mouse_motion ($ev, $x, $y);
1834} 2233}
1835 2234
1836sub mouse_motion { 2235sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2236 my ($self, $ev, $x, $y) = @_;
1838 2237
1839 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
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2255 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100;
1841 2257
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2258 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843 2259
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2260 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2261 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846 2262
1847 $x -= $inner_pad_px; # substract the padding 2263 $value = ($value - $lo) / $range;
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2264 $value = $value * $self->{scale} + $self->{offset};
1849 $x = $lo if $x < $lo;
1850 $x = $hi - $page if $x > $hi - $page;
1851 $self->{range}[0] = $x;
1852 2265
1853 $self->emit (changed => $x); 2266 $self->{knob_x} = $value - $knob_w * 0.5;
1854 $self->update; 2267 $self->{knob_w} = $knob_w;
1855 } 2268 });
1856}
1857 2269
1858# the inner_* stuff is for generating a padding for the slider handle, 2270 $self->SUPER::update;
1859# so that the handle doesn't leave the texture. This calculation isn't 100%
1860# correct propably, but it does the job for now
1861sub _calc_inner_pad_px {
1862 my ($self, $w) = @_;
1863 ($w / 100) * $self->{inner_pad} # % to pixels
1864} 2271}
1865 2272
1866sub _draw { 2273sub _draw {
1867 my ($self) = @_; 2274 my ($self) = @_;
1868 2275
1869 $self->SUPER::_draw (); 2276 $self->SUPER::_draw ();
1870 2277
1871 my ($w, $h) = @$self{qw(w h)}; 2278 glScale $self->{w}, $self->{h};
1872 2279
1873 if ($self->{vertical}) { 2280 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2281 # draw a vertical slider like a rotated horizontal slider
1875 2282
2283 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2284 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2285 }
1881 2286
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2287 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2288 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2289
1885 my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887 $hi = $value + 1 if $lo == $hi;
1888
1889 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892 $page = int $page * $inner_w / ($hi - $lo);
1893 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895 $w -= $page;
1896 $page &= ~1;
1897 glTranslate $page * 0.5, 0, 0;
1898 $page ||= 2;
1899
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2290 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2292
1908 # draw background 2293 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2294 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2295
1911 # draw handle 2296 # draw handle
1912 $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);
1913 2298
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
1916} 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 (@_) }
1917 2342
1918############################################################################# 2343#############################################################################
1919 2344
1920package CFClient::UI::TextView; 2345package CFClient::UI::TextView;
1921 2346
… …
1925 2350
1926sub new { 2351sub new {
1927 my $class = shift; 2352 my $class = shift;
1928 2353
1929 my $self = $class->SUPER::new ( 2354 my $self = $class->SUPER::new (
1930 fontsize => 1, 2355 fontsize => 1,
2356 can_events => 0,
1931 #font => default_font 2357 #font => default_font
1932 @_, 2358 @_,
1933 2359
1934 layout => (new CFClient::Layout), 2360 layout => (new CFClient::Layout 1),
1935 par => [], 2361 par => [],
1936 height => 0, 2362 height => 0,
1937 children => [ 2363 children => [
1938 (new CFClient::UI::Empty expand => 1), 2364 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2365 (new CFClient::UI::Slider vertical => 1),
1940 ], 2366 ],
1941 ); 2367 );
1942 2368
1943 $self->{children}[1]->connect (changed => sub { 2369 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2370
1947 $self 2371 $self
1948} 2372}
1949 2373
1950sub set_fontsize { 2374sub set_fontsize {
… …
1952 2376
1953 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2378 $self->reflow;
1955} 2379}
1956 2380
1957sub text_height {
1958 my ($self, $text) = @_;
1959
1960 my $layout = $self->{layout};
1961
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w});
1964 $layout->set_text ($text);
1965
1966 ($layout->size)[1]
1967}
1968
1969sub reflow {
1970 my ($self) = @_;
1971
1972 $self->{need_reflow}++;
1973 $self->update;
1974}
1975
1976sub size_allocate { 2381sub size_allocate {
1977 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
1978 2383
1979 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
1980 2387
1981 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
1982 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2391
1985 $self->reflow; 2392 $self->reflow;
1986} 2393}
1987 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
1988sub add_paragraph { 2429sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2430 my ($self, $color, $text, $indent) = @_;
1990 2431
1991 #TODO: intelligently "reformat" paragraph 2432 for my $line (split /\n/, $text) {
1992 2433 my ($w, $h) = $self->text_size ($line);
1993 my $height = $self->text_height ($text);
1994
1995 $self->{height} += $height; 2434 $self->{height} += $h;
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2436 }
1996 2437
1997 push @{$self->{par}}, [$height, $color, $text];
1998
1999 $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]);
2000 $self->{children}[1]->update;
2001} 2439}
2002 2440
2003sub update { 2441sub update {
2004 my ($self) = @_; 2442 my ($self) = @_;
2005 2443
… …
2007 2445
2008 return unless $self->{h} > 0; 2446 return unless $self->{h} > 0;
2009 2447
2010 delete $self->{texture}; 2448 delete $self->{texture};
2011 2449
2012 $ROOT->on_refresh ($self, sub { 2450 $ROOT->on_post_alloc ($self, sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452
2013 if (delete $self->{need_reflow}) { 2453 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2454 my $height = 0;
2015 2455
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2017 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 }
2018 2471
2019 $self->{height} = $height; 2472 $self->{height} = $height;
2020 2473
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022 2475
2023 delete $self->{texture}; 2476 delete $self->{texture};
2024 } 2477 }
2025 2478
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027 glClearColor 0, 0, 0, 1; 2480 glClearColor 0.5, 0.5, 0.5, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2481 glClear GL_COLOR_BUFFER_BIT;
2029 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
2030 glEnable GL_BLEND; 2494 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034
2035 my $top = int $self->{children}[1]{range}[0];
2036
2037 my $y0 = $top;
2038 my $y1 = $top + $self->{h};
2039
2040 my $y = 0;
2041
2042 my $layout = $self->{layout};
2043
2044 $layout->set_font ($self->{font}) if $self->{font};
2045 2497
2046 for my $par (@{$self->{par}}) { 2498 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2499 my $h = $par->[1];
2048 2500
2049 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]);
2050 $layout->set_text ($par->[2]); 2504 $layout->set_markup ($par->[4]);
2051 2505
2052 glColor @{ $par->[1] }; 2506 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2507
2054 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;
2055 } 2510 }
2056 2511
2057 $y += $h; 2512 $y += $h;
2058 } 2513 }
2059 2514
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2515 glDisable GL_BLEND;
2062 }; 2516 };
2063 }); 2517 });
2064} 2518}
2065 2519
2066sub _draw { 2520sub _draw {
2067 my ($self) = @_; 2521 my ($self) = @_;
2068 2522
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2523 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2527 glDisable GL_TEXTURE_2D;
2074 }
2075 2528
2076 $self->{children}[1]->draw; 2529 $self->{children}[1]->draw;
2077 2530
2078} 2531}
2079 2532
… …
2127 2580
2128sub new { 2581sub new {
2129 my $class = shift; 2582 my $class = shift;
2130 2583
2131 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2132 state => 0, 2585 state => 0,
2133 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2587 @_
2136 ); 2588 );
2137 2589
2138 if ($self->{state}) {
2139 $self->{state} = 0;
2140 $self->toggle_flopper;
2141 }
2142
2143 $self 2590 $self
2144} 2591}
2145 2592
2146sub toggle_flopper { 2593sub toggle_flopper {
2147 my ($self) = @_; 2594 my ($self) = @_;
2148 2595
2149 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2150 if ($self->{state} = !$self->{state}) {
2151 $CFClient::UI::ROOT->add ($self->{other});
2152 $self->{other}->move ($self->coord2global (0, $self->{h}));
2153 $self->emit ("open");
2154 } else {
2155 $CFClient::UI::ROOT->remove ($self->{other});
2156 $self->emit ("close");
2157 }
2158
2159 $self->emit (changed => $self->{state});
2160} 2597}
2161 2598
2162############################################################################# 2599#############################################################################
2163 2600
2164package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2174 @_, 2611 @_,
2175 can_events => 0, 2612 can_events => 0,
2176 ) 2613 )
2177} 2614}
2178 2615
2179sub set_text { 2616sub set_tooltip_from {
2180 my ($self, $text) = @_; 2617 my ($self, $widget) = @_;
2181 2618
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2619 $self->add (new CFClient::UI::Label
2183 $self->{label}->set_text ($text); 2620 markup => $widget->{tooltip},
2184 $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 );
2185} 2627}
2186 2628
2187sub size_request { 2629sub size_request {
2188 my ($self) = @_; 2630 my ($self) = @_;
2189 2631
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2633
2194 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2195} 2635}
2196 2636
2637sub size_allocate {
2638 my ($self, $w, $h, $changed) = @_;
2639
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2643}
2644
2197sub _draw { 2645sub _draw {
2198 my ($self) = @_; 2646 my ($self) = @_;
2199 2647
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2648 glTranslate 0.375, 0.375;
2202 2649
2203 my ($w, $h) = @$self{qw(w h)}; 2650 my ($w, $h) = @$self{qw(w h)};
2204 2651
2205 glColor 1, 0.8, 0.4; 2652 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2663 glVertex 0 , $h;
2217 glVertex $w, $h; 2664 glVertex $w, $h;
2218 glVertex $w, 0; 2665 glVertex $w, 0;
2219 glEnd; 2666 glEnd;
2220 2667
2221 glPopMatrix; 2668 glTranslate 2 - 0.375, 2 - 0.375;
2222
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2669 $self->SUPER::_draw;
2225} 2670}
2226 2671
2227############################################################################# 2672#############################################################################
2228 2673
2674package CFClient::UI::Face;
2675
2676our @ISA = CFClient::UI::Base::;
2677
2678use CFClient::OpenGL;
2679
2680sub new {
2681 my $class = shift;
2682
2683 my $self = $class->SUPER::new (
2684 aspect => 1,
2685 can_events => 0,
2686 @_,
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
2704}
2705
2706sub size_request {
2707 (32, 8)
2708}
2709
2710sub update {
2711 my ($self) = @_;
2712
2713 return unless $self->{visible};
2714
2715 $self->SUPER::update;
2716}
2717
2718sub _draw {
2719 my ($self) = @_;
2720
2721 return unless $::CONN;
2722
2723 my $face;
2724
2725 if ($self->{frame}) {
2726 my $anim = $::CONN->{anim}[$self->{anim}];
2727
2728 $face = $anim->[ $self->{frame} % @$anim ]
2729 if $anim && @$anim;
2730 }
2731
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733
2734 if ($tex) {
2735 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D;
2740 }
2741}
2742
2743sub DESTROY {
2744 my ($self) = @_;
2745
2746 $self->{timer}->cancel
2747 if $self->{timer};
2748
2749 $self->SUPER::DESTROY;
2750}
2751
2752#############################################################################
2753
2754package CFClient::UI::Inventory;
2755
2756our @ISA = CFClient::UI::ScrolledWindow::;
2757
2758sub new {
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793
2794#############################################################################
2795
2796package CFClient::UI::Menu;
2797
2798our @ISA = CFClient::UI::FancyFrame::;
2799
2800use CFClient::OpenGL;
2801
2802sub new {
2803 my $class = shift;
2804
2805 my $self = $class->SUPER::new (
2806 items => [],
2807 z => 100,
2808 @_,
2809 );
2810
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812
2813 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item;
2815
2816 # handle various types of items, only text for now
2817 if (!ref $widget) {
2818 $widget = new CFClient::UI::Label
2819 can_hover => 1,
2820 can_events => 1,
2821 text => $widget;
2822 }
2823
2824 $self->{item}{$widget} = $item;
2825
2826 $self->{vbox}->add ($widget);
2827 }
2828
2829 $self
2830}
2831
2832# popup given the event (must be a mouse button down event currently)
2833sub popup {
2834 my ($self, $ev) = @_;
2835
2836 $self->_emit ("popdown");
2837
2838 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self;
2840 $self->{button} = $ev->{button};
2841
2842 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844}
2845
2846sub mouse_motion {
2847 my ($self, $ev, $x, $y) = @_;
2848
2849 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER};
2852}
2853
2854sub button_up {
2855 my ($self, $ev, $x, $y) = @_;
2856
2857 if ($ev->{button} == $self->{button}) {
2858 undef $GRAB;
2859 $self->hide;
2860
2861 $self->_emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover};
2863 }
2864}
2865
2866#############################################################################
2867
2868package CFClient::UI::Statusbox;
2869
2870our @ISA = CFClient::UI::VBox::;
2871
2872sub new {
2873 my $class = shift;
2874
2875 $class->SUPER::new (
2876 fontsize => 0.8,
2877 @_,
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
2229package CFClient::UI::Root; 2978package CFClient::UI::Root;
2230 2979
2231our @ISA = CFClient::UI::Container::; 2980our @ISA = CFClient::UI::Container::;
2232 2981
2233use CFClient::OpenGL; 2982use CFClient::OpenGL;
2234 2983
2235sub check_size { 2984sub new {
2236 my ($self) = @_; 2985 my $class = shift;
2237 2986
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2987 my $self = $class->SUPER::new (
2239} 2988 visible => 1,
2989 @_,
2990 );
2240 2991
2241sub size_request { 2992 Scalar::Util::weaken ($self->{root} = $self);
2242 ($::WIDTH, $::HEIGHT) 2993
2994 $self
2243} 2995}
2244 2996
2245sub configure { 2997sub configure {
2246 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2247 2999
2248 $self->SUPER::configure ($x, $y, $w, $h); 3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
2249 3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request {
3014 my ($self) = @_;
3015
3016 ($self->{w}, $self->{h})
3017}
3018
3019sub size_allocate {
3020 my ($self, $w, $h, $changed) = @_;
3021
2250 for my $child (@{$self->{children}}) { 3022 for my $child ($self->children) {
2251 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)};
2252 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
2253 $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;
2254 $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
2255 $child->configure ($X, $Y, $W,$H); 3036 $child->configure ($X, $Y, $W, $H);
2256 } 3037 }
2257} 3038}
2258 3039
2259sub _topleft { 3040sub coord2local {
2260 my ($self, $x, $y) = @_; 3041 my ($self, $x, $y) = @_;
2261 3042
2262 ($x, $y) 3043 ($x, $y)
2263} 3044}
2264 3045
3046sub coord2global {
3047 my ($self, $x, $y) = @_;
3048
3049 ($x, $y)
3050}
3051
2265sub update { 3052sub update {
2266 my ($self) = @_; 3053 my ($self) = @_;
2267 3054
2268 $self->check_size; 3055 $::WANT_REFRESH++;
2269 ::refresh ();
2270} 3056}
2271 3057
2272sub add { 3058sub add {
2273 my ($self, $child) = @_; 3059 my ($self, @children) = @_;
2274 3060
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1;
3063
2275 # integerize window positions 3064 # integerise window positions
2276 $child->{x} = int $child->{x}; 3065 $child->{x} = int $child->{x};
2277 $child->{y} = int $child->{y}; 3066 $child->{y} = int $child->{y};
3067 }
2278 3068
2279 $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 }
2280} 3082}
2281 3083
2282sub on_refresh { 3084sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3085 my ($self, $id, $cb) = @_;
2284 3086
2285 $self->{refresh_hook}{$id} = $cb; 3087 $self->{refresh_hook}{$id} = $cb;
2286} 3088}
2287 3089
3090sub on_post_alloc {
3091 my ($self, $id, $cb) = @_;
3092
3093 $self->{post_alloc_hook}{$id} = $cb;
3094}
3095
2288sub draw { 3096sub draw {
2289 my ($self) = @_; 3097 my ($self) = @_;
2290 3098
2291 while (my $rcb = delete $self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
2292 $_->() 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}};
2293 } 3154 }
2294 3155
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3156 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3158 glClear GL_COLOR_BUFFER_BIT;
2298 3159
2299 glMatrixMode GL_PROJECTION; 3160 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3161 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3163 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3164 glLoadIdentity;
2304 3165
2305 $self->_draw; 3166 $self->_draw;
2306} 3167}
… …
2308############################################################################# 3169#############################################################################
2309 3170
2310package CFClient::UI; 3171package CFClient::UI;
2311 3172
2312$ROOT = new CFClient::UI::Root; 3173$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3174$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3175
23151 31761
2316 3177

Diff Legend

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