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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

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

Diff Legend

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