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

Diff Legend

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