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

Diff Legend

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