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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines