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.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 2006 UTC

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

Diff Legend

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