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.197 by root, Fri May 12 01:47:04 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;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
262sub set_max_size { 374sub set_max_size {
263 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
264 376
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
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 }
267} 395}
268 396
269# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
270sub coord2local { 398sub coord2local {
271 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
… …
286 return if $FOCUS == $self; 414 return if $FOCUS == $self;
287 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
288 416
289 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
290 418
291 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
292 420
293 $focus->update if $focus; 421 $focus->update if $focus;
294 $FOCUS->update; 422 $FOCUS->update;
295} 423}
296 424
… …
299 427
300 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
301 429
302 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
303 431
304 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
305 433
306 $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;
307} 438}
308 439
309sub mouse_motion { } 440sub mouse_motion { }
310sub button_up { } 441sub button_up { }
311sub key_down { } 442sub key_down { }
312sub key_up { } 443sub key_up { }
313 444
314sub button_down { 445sub button_down {
315 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
316 447
317 $self->focus_in; 448 $self->focus_in;
… …
320sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
321sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
322sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
323sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
324sub 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}
325 525
326sub draw { 526sub draw {
327 my ($self) = @_; 527 my ($self) = @_;
328 528
329 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
346 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
347 glEnd; 547 glEnd;
348 glDisable GL_BLEND; 548 glDisable GL_BLEND;
349 } 549 }
350 550
351 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
352 glPushMatrix; 552 glPushMatrix;
353 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
354 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
356 glVertex 0 , 0; 556 glVertex 0 , 0;
357 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
358 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
359 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
360 glEnd; 560 glEnd;
361 glPopMatrix; 561 glPopMatrix;
362 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;
363 } 563 }
364} 564}
365 565
366sub _draw { 566sub _draw {
367 my ($self) = @_; 567 my ($self) = @_;
368 568
369 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
370} 570}
371 571
372sub find_widget {
373 my ($self, $x, $y) = @_;
374
375 return () unless $self->{can_events};
376
377 return $self
378 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
379 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
380
381 ()
382}
383
384sub set_parent {
385 my ($self, $parent) = @_;
386
387 Scalar::Util::weaken ($self->{parent} = $parent);
388
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#############################################################################
… …
628} 787}
629 788
630sub update { 789sub update {
631 my ($self) = @_; 790 my ($self) = @_;
632 791
633 $ROOT->on_refresh ($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});
… …
776 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
777 946
778 $self 947 $self
779} 948}
780 949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967}
968
781#TODO# update range on size_allocate depeneing 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
784############################################################################# 972#############################################################################
785 973
786package CFClient::UI::Frame; 974package CFClient::UI::Frame;
787 975
788our @ISA = CFClient::UI::Bin::; 976our @ISA = CFClient::UI::Bin::;
789 977
790use CFClient::OpenGL; 978use CFClient::OpenGL;
791
792#############################################################################
793
794package CFClient::UI::FancyFrame;
795
796our @ISA = CFClient::UI::Bin::;
797
798use CFClient::OpenGL;
799
800my @tex =
801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
802 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803 979
804sub new { 980sub new {
805 my $class = shift; 981 my $class = shift;
806 982
807 # TODO: user_x, user_y, overwrite moveto? 983 $class->SUPER::new (
984 bg => undef,
985 @_,
986 )
987}
988
989sub _draw {
990 my ($self) = @_;
991
992 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)};
994
995 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} };
998
999 glBegin GL_QUADS;
1000 glVertex 0 , 0;
1001 glVertex 0 , $h;
1002 glVertex $w, $h;
1003 glVertex $w, 0;
1004 glEnd;
1005
1006 glDisable GL_BLEND;
1007 }
1008
1009 $self->SUPER::_draw;
1010}
1011
1012#############################################################################
1013
1014package CFClient::UI::FancyFrame;
1015
1016our @ISA = CFClient::UI::Bin::;
1017
1018use CFClient::OpenGL;
1019
1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027
1028sub new {
1029 my $class = shift;
808 1030
809 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
812 border => 0.6, 1034 border => 0.6,
813 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
814 @_ 1038 @_
815 ); 1039 );
816 1040
817 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
818 align => 0, 1042 align => 0,
… …
837 $h + $self->border * 2, 1061 $h + $self->border * 2,
838 ) 1062 )
839} 1063}
840 1064
841sub size_allocate { 1065sub size_allocate {
842 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
843 1069
844 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
846 1072
847 $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)
848 if $self->{title}; 1074 if $self->{title};
849 1075
850 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
851} 1077}
852 1078
… …
871 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
872 1098
873 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
875 1101
876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
879 $self->check_size;
880 }; 1107 };
881 1108
882 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
883 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
884 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
886 $self->{motion} = sub { 1113 $self->{motion} = sub {
887 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
888 1115
889 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
890 1117
891 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
892 $self->update;
893 }; 1119 };
894 } 1120 }
895} 1121}
896 1122
897sub button_up { 1123sub button_up {
… …
916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
917 1143
918 my $border = $self->border; 1144 my $border = $self->border;
919 1145
920 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
921 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
925 1151
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
927 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
928 1154
929 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
930 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
931 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
932
933 glColor @{ $self->{bg} };
934
935 $bg->{s} = $rep_x;
936 $bg->{t} = $rep_y;
937 $bg->{wrap_mode} = 1;
938 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 } 1160 }
940 1161
941 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
942 1163
… …
958sub new { 1179sub new {
959 my $class = shift; 1180 my $class = shift;
960 1181
961 $class->SUPER::new ( 1182 $class->SUPER::new (
962 col_expand => [], 1183 col_expand => [],
963 @_ 1184 @_,
964 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
965} 1190}
966 1191
967sub add { 1192sub add {
968 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
969 1194
970 $child->set_parent ($self); 1195 $child->set_parent ($self);
971 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
972 1197
973 $child->check_size; 1198 $self->realloc;
974} 1199}
975 1200
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
980# 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?
981sub clear { 1202sub clear {
982 my ($self) = @_; 1203 my ($self) = @_;
983 1204
984 my @children = $self->children; 1205 my @children = $self->children;
985 delete $self->{children}; 1206 delete $self->{children};
… …
987 for (@children) { 1208 for (@children) {
988 delete $_->{parent}; 1209 delete $_->{parent};
989 $_->hide; 1210 $_->hide;
990 } 1211 }
991 1212
992 $self->update; 1213 $self->realloc;
993} 1214}
994 1215
995sub get_wh { 1216sub get_wh {
996 my ($self) = @_; 1217 my ($self) = @_;
997 1218
… …
1024 (sum @$hs), 1245 (sum @$hs),
1025 ) 1246 )
1026} 1247}
1027 1248
1028sub size_allocate { 1249sub size_allocate {
1029 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1030 1251
1031 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1032 1253
1033 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1034 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1035 1256
1036 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1037 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1038 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1039 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1093 } 1314 }
1094} 1315}
1095 1316
1096############################################################################# 1317#############################################################################
1097 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
1098package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1099 1380
1100# TODO: wrap into common Box base class
1101
1102our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1103 1382
1104sub size_request { 1383sub new {
1105 my ($self) = @_; 1384 my $class = shift;
1106 1385
1107 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1108 1387 vertical => 0,
1109 ( 1388 @_,
1110 (List::Util::sum map $_->[0], @alloc),
1111 (List::Util::max map $_->[1], @alloc),
1112 ) 1389 )
1113} 1390}
1114 1391
1115sub size_allocate {
1116 my ($self, $w, $h) = @_;
1117
1118 ($h, $w) = ($w, $h);
1119
1120 my $children = $self->{children};
1121
1122 my @h = map $_->{req_w}, @$children;
1123
1124 my $req_h = List::Util::sum @h;
1125
1126 if ($req_h > $h) {
1127 # ah well, not enough space
1128 $_ *= $h / $req_h for @h;
1129 } else {
1130 my $exp = List::Util::sum map $_->{expand}, @$children;
1131 $exp ||= 1;
1132
1133 for (0 .. $#$children) {
1134 my $child = $children->[$_];
1135
1136 my $alloc_h = $h[$_];
1137 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138 $h[$_] = $alloc_h;
1139 }
1140 }
1141
1142 CFClient::UI::harmonize \@h;
1143
1144 my $y = 0;
1145 for (0 .. $#$children) {
1146 my $child = $children->[$_];
1147 my $h = $h[$_];
1148 $child->configure ($y, 0, $h, $w);
1149
1150 $y += $h;
1151 }
1152
1153 1
1154}
1155
1156############################################################################# 1392#############################################################################
1157 1393
1158package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1159 1395
1160# TODO: wrap into common Box base class
1161
1162our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1163 1397
1164sub size_request { 1398sub new {
1165 my ($self) = @_; 1399 my $class = shift;
1166 1400
1167 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1168 1402 vertical => 1,
1169 ( 1403 @_,
1170 (List::Util::max map $_->[0], @alloc),
1171 (List::Util::sum map $_->[1], @alloc),
1172 ) 1404 )
1173} 1405}
1174 1406
1175sub size_allocate {
1176 my ($self, $w, $h) = @_;
1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180 my $children = $self->{children};
1181
1182 my @h = map $_->{req_h}, @$children;
1183
1184 my $req_h = List::Util::sum @h;
1185
1186 if ($req_h > $h) {
1187 # ah well, not enough space
1188 $_ *= $h / $req_h for @h;
1189 } else {
1190 my $exp = List::Util::sum map $_->{expand}, @$children;
1191 $exp ||= 1;
1192
1193 for (0 .. $#$children) {
1194 my $child = $children->[$_];
1195
1196 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197 }
1198 }
1199
1200 CFClient::UI::harmonize \@h;
1201
1202 my $y = 0;
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205 my $h = $h[$_];
1206 $child->configure (0, $y, $w, $h);
1207
1208 $y += $h;
1209 }
1210
1211 1
1212}
1213
1214############################################################################# 1407#############################################################################
1215 1408
1216package CFClient::UI::Label; 1409package CFClient::UI::Label;
1217 1410
1218our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1219 1412
1220use CFClient::OpenGL; 1413use CFClient::OpenGL;
1221 1414
1222sub new { 1415sub new {
1223 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1224 1417
1225 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1227 #font => default_font 1422 #font => default_font
1228 #text => initial text 1423 #text => initial text
1229 #markup => initial narkup 1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1231 fontsize => 1, 1428 fontsize => 1,
1232 align => -1, 1429 align => -1,
1233 valign => -1, 1430 valign => -1,
1234 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1235 can_events => 0, 1433 can_events => 0,
1236 %arg 1434 %arg
1237 ); 1435 );
1238 1436
1239 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1249 } 1447 }
1250 1448
1251 $self 1449 $self
1252} 1450}
1253 1451
1254sub escape { 1452sub escape($) {
1255 local $_ = $_[1]; 1453 local $_ = $_[0];
1256 1454
1257 s/&/&amp;/g; 1455 s/&/&amp;/g;
1258 s/>/&gt;/g; 1456 s/>/&gt;/g;
1259 s/</&lt;/g; 1457 s/</&lt;/g;
1260 1458
1261 $_[1] 1459 $_
1262} 1460}
1263 1461
1264sub update { 1462sub update {
1265 my ($self) = @_; 1463 my ($self) = @_;
1266 1464
… …
1275 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1276 1474
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1279 1477
1478 $self->realloc;
1280 $self->update; 1479 $self->update;
1281 $self->check_size;
1282} 1480}
1283 1481
1284sub set_markup { 1482sub set_markup {
1285 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1286 1484
… …
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291 1489
1292 $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;
1293 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1294 1492
1493 $self->realloc;
1295 $self->update; 1494 $self->update;
1296 $self->check_size;
1297} 1495}
1298 1496
1299sub size_request { 1497sub size_request {
1300 my ($self) = @_; 1498 my ($self) = @_;
1301 1499
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1505
1306 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1307 1507
1308 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1313 1513
1314 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1315 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1316 } 1516 }
1317 1517
1318 ( 1518 ($w, $h)
1319 $w + $self->{padding} * 2,
1320 $h + $self->{padding} * 2,
1321 )
1322} 1519}
1323 1520
1324sub size_allocate { 1521sub size_allocate {
1325 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1326 1523
1327 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1328} 1526}
1329 1527
1330sub set_fontsize { 1528sub set_fontsize {
1331 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1332 1530
1333 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1334 delete $self->{texture}; 1532 delete $self->{texture};
1335 1533
1336 $self->update; 1534 $self->realloc;
1337 $self->check_size;
1338} 1535}
1339 1536
1340sub _draw { 1537sub _draw {
1341 my ($self) = @_; 1538 my ($self) = @_;
1539
1540 $self->SUPER::_draw; # draw background, if applicable
1342 1541
1343 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1543 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $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});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1549
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1551
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1554 : ($self->{w} - $tex->{w}) * 0.5);
1354 1555
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1558 : ($self->{h} - $tex->{h}) * 0.5);
1358 1559
1359 $tex 1560 $tex
1360 }; 1561 };
1361 1562
1362 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
… …
1390 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1391 can_hover => 1, 1592 can_hover => 1,
1392 can_focus => 1, 1593 can_focus => 1,
1393 valign => 0, 1594 valign => 0,
1394 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1395 @_ 1597 @_
1396 ) 1598 )
1397} 1599}
1398 1600
1399sub _set_text { 1601sub _set_text {
… …
1409 $self->{text} = $text; 1611 $self->{text} = $text;
1410 1612
1411 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1413 1615
1414 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1415} 1617}
1416 1618
1417sub set_text { 1619sub set_text {
1418 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1419 1621
1420 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1623 $self->_set_text ($text);
1422 $self->check_size; 1624
1423 $self->update; 1625 $self->realloc;
1424} 1626}
1425 1627
1426sub get_text { 1628sub get_text {
1427 $_[0]{text} 1629 $_[0]{text}
1428} 1630}
… …
1431 my ($self) = @_; 1633 my ($self) = @_;
1432 1634
1433 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1434 1636
1435 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1436}
1437
1438sub size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442} 1638}
1443 1639
1444sub key_down { 1640sub key_down {
1445 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1446 1642
… …
1448 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1645 my $uni = $ev->{unicode};
1450 1646
1451 my $text = $self->get_text; 1647 my $text = $self->get_text;
1452 1648
1453 if ($sym == 8) { 1649 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1651 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1652 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1653 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1654 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1655 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1656 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1661 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1662 $self->_emit ('escape');
1467 } elsif ($uni) { 1663 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1665 }
1470 1666
1471 $self->_set_text ($text); 1667 $self->_set_text ($text);
1472 $self->update; 1668
1669 $self->realloc;
1473} 1670}
1474 1671
1475sub focus_in { 1672sub focus_in {
1476 my ($self) = @_; 1673 my ($self) = @_;
1477 1674
… …
1557 if ($sym == 13) { 1754 if ($sym == 13) {
1558 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1563 $self->update; 1760 $self->update;
1564 1761
1565 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1604 1801
1605sub new { 1802sub new {
1606 my $class = shift; 1803 my $class = shift;
1607 1804
1608 $class->SUPER::new ( 1805 $class->SUPER::new (
1609 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1610 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1613 can_hover => 1, 1810 can_hover => 1,
1614 align => 0, 1811 align => 0,
1615 valign => 0, 1812 valign => 0,
1616 can_events => 1, 1813 can_events => 1,
1617 @_ 1814 @_
1618 ) 1815 )
1619} 1816}
1620 1817
1818sub activate { }
1819
1621sub button_up { 1820sub button_up {
1622 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1623 1822
1823 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate");
1627 }
1628} 1826}
1629 1827
1630sub _draw { 1828sub _draw {
1631 my ($self) = @_; 1829 my ($self) = @_;
1632 1830
… …
1661 1859
1662sub new { 1860sub new {
1663 my $class = shift; 1861 my $class = shift;
1664 1862
1665 $class->SUPER::new ( 1863 $class->SUPER::new (
1666 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1667 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1668 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],
1669 state => 0, 1870 state => 0,
1670 can_hover => 1, 1871 can_hover => 1,
1671 @_ 1872 @_
1672 ) 1873 )
1673} 1874}
1674 1875
1675sub size_request { 1876sub size_request {
1676 my ($self) = @_; 1877 my ($self) = @_;
1677 1878
1678 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1679} 1880}
1680 1881
1681sub button_down { 1882sub button_down {
1682 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1683 1884
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1686 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1687 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1688 } 1889 }
1689} 1890}
1690 1891
1691sub _draw { 1892sub _draw {
1692 my ($self) = @_; 1893 my ($self) = @_;
1693 1894
1694 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1695 1896
1696 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1697 1898
1698 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;
1699 1902
1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1701 1904
1702 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703 1906
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
1958 2161
1959sub new { 2162sub new {
1960 my $class = shift; 2163 my $class = shift;
1961 2164
1962 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
1963 2166
1964 # TODO: 0-width page 2167 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2169 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
1969 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],
1970 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
1973 vertical => 0, 2178 vertical => 0,
1974 can_hover => 1, 2179 can_hover => 1,
1975 inner_pad => 5, 2180 inner_pad => 0.02,
1976 @_ 2181 @_
1977 ); 2182 );
1978 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
1979 $self 2187 $self
1980} 2188}
1981 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
1982sub size_request { 2224sub size_request {
1983 my ($self) = @_; 2225 my ($self) = @_;
1984 2226
1985 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
1986 my $h = $self->{req_h};
1987
1988 $self->{vertical} ? ($h, $w) : ($w, $h)
1989} 2228}
1990 2229
1991sub button_down { 2230sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1993 2232
1994 $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
1995 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
1996} 2238}
1997 2239
1998sub mouse_motion { 2240sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
2000 2242
2001 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
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
2003 2262
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2264
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2267
2009 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2270
2015 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2272 $self->{knob_w} = $knob_w;
2017 } 2273 });
2018}
2019 2274
2020# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026} 2276}
2027 2277
2028sub _draw { 2278sub _draw {
2029 my ($self) = @_; 2279 my ($self) = @_;
2030 2280
2031 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
2032 2282
2033 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
2034 2284
2035 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
2037 2287
2288 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2290 }
2043 2291
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2294
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2297
2068 # draw background 2298 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2300
2071 # draw handle 2301 # draw handle
2072 $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);
2073 2303
2074 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2075} 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 (@_) }
2076 2347
2077############################################################################# 2348#############################################################################
2078 2349
2079package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2080 2351
… …
2110 2381
2111 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2383 $self->reflow;
2113} 2384}
2114 2385
2115sub text_height {
2116 my ($self, $text) = @_;
2117
2118 my $layout = $self->{layout};
2119
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w});
2122 $layout->set_markup ($text);
2123
2124 ($layout->size)[1]
2125}
2126
2127sub reflow {
2128 my ($self) = @_;
2129
2130 $self->{need_reflow}++;
2131 $self->update;
2132}
2133
2134sub size_allocate { 2386sub size_allocate {
2135 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2136 2388
2137 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2138 2392
2139 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2140 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2396
2143 $self->reflow; 2397 $self->reflow;
2144} 2398}
2145 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
2146sub add_paragraph { 2434sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2148 2436
2149 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2150 2438 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2154 2442
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $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]);
2158 $self->{children}[1]->update;
2159} 2444}
2160 2445
2161sub update { 2446sub update {
2162 my ($self) = @_; 2447 my ($self) = @_;
2163 2448
… …
2165 2450
2166 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2167 2452
2168 delete $self->{texture}; 2453 delete $self->{texture};
2169 2454
2170 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2171 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2459 my $height = 0;
2173 2460
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2175 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 }
2176 2476
2177 $self->{height} = $height; 2477 $self->{height} = $height;
2178 2478
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2480
2181 delete $self->{texture}; 2481 delete $self->{texture};
2182 } 2482 }
2183 2483
2184 $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 {
2185 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2187 2487
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2192 2489
2193 my $y0 = $top; 2490 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2195 2492
2196 my $y = 0; 2493 my $y = 0;
2197 2494
2198 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2199 2496
2200 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2201 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
2202 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2504 my $h = $par->[1];
2204 2505
2205 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2208 2510
2209 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 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;
2211 } 2515 }
2212 2516
2213 $y += $h; 2517 $y += $h;
2214 } 2518 }
2215 2519
2216 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2217 }; 2521 };
2218 }); 2522 });
2219} 2523}
2220 2524
2221sub _draw { 2525sub _draw {
2222 my ($self) = @_; 2526 my ($self) = @_;
2223 2527
2224 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2227 $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});
2228 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2229 2533
2230 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2231 2535
2232} 2536}
… …
2281 2585
2282sub new { 2586sub new {
2283 my $class = shift; 2587 my $class = shift;
2284 2588
2285 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2286 state => 0, 2590 state => 0,
2287 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2288 @_ 2592 @_
2289 ); 2593 );
2290 2594
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2595 $self
2297} 2596}
2298 2597
2299sub toggle_flopper { 2598sub toggle_flopper {
2300 my ($self) = @_; 2599 my ($self) = @_;
2301 2600
2302 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2602}
2314 2603
2315############################################################################# 2604#############################################################################
2316 2605
2317package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2331 2620
2332sub set_tooltip_from { 2621sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2334 2623
2335 $self->add (new CFClient::UI::Label 2624 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2625 markup => $widget->{tooltip},
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2627 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2631 );
2342} 2632}
2343 2633
2344sub size_request { 2634sub size_request {
2345 my ($self) = @_; 2635 my ($self) = @_;
… …
2348 2638
2349 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2350} 2640}
2351 2641
2352sub size_allocate { 2642sub size_allocate {
2353 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2354 2644
2645 return unless $changed;
2646
2355 $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 });
2356} 2666}
2357 2667
2358sub _draw { 2668sub _draw {
2359 my ($self) = @_; 2669 my ($self) = @_;
2360 2670
… …
2377 glVertex $w, $h; 2687 glVertex $w, $h;
2378 glVertex $w, 0; 2688 glVertex $w, 0;
2379 glEnd; 2689 glEnd;
2380 2690
2381 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2382 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2383} 2694}
2384 2695
2385############################################################################# 2696#############################################################################
2386 2697
… …
2391use CFClient::OpenGL; 2702use CFClient::OpenGL;
2392 2703
2393sub new { 2704sub new {
2394 my $class = shift; 2705 my $class = shift;
2395 2706
2396 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2397 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2398 @_, 2710 @_,
2399 ) 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
2400} 2728}
2401 2729
2402sub size_request { 2730sub size_request {
2403 (32, 8) 2731 (32, 8)
2404} 2732}
2405 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2406sub _draw { 2742sub _draw {
2407 my ($self) = @_; 2743 my ($self) = @_;
2408 2744
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2757
2412 # TODO animation
2413 if ($tex) { 2758 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2419 } 2764 }
2420} 2765}
2421 2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2422############################################################################# 2776#############################################################################
2423 2777
2424package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2425 2779
2426our @ISA = CFClient::UI::HBox::; 2780our @ISA = CFClient::UI::ScrolledWindow::;
2427 2781
2428sub new { 2782sub new {
2429 my $class = shift; 2783 my $class = shift;
2430 2784
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2441 can_hover => 1, 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_, 2787 @_,
2500 ); 2788 );
2501 2789
2502 $self 2790 $self
2503} 2791}
… …
2506 my ($self, $items) = @_; 2794 my ($self, $items) = @_;
2507 2795
2508 $self->{scrolled}->clear; 2796 $self->{scrolled}->clear;
2509 return unless $items; 2797 return unless $items;
2510 2798
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2512 2803
2513 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2514 2805
2806 my $row = 0;
2515 for my $item (@items) { 2807 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2 2808 CFClient::Item::update_widgets $item;
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519 2809
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2521 } 2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2522 2813
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2814 $row++;
2524} 2815 }
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529} 2816}
2530 2817
2531############################################################################# 2818#############################################################################
2532 2819
2533package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2568 2855
2569# 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)
2570sub popup { 2857sub popup {
2571 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2572 2859
2573 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2574 2861
2575 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 2863 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2578 2865
2579 $self->show; 2866 $self->show;
2580 $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);
2581} 2868}
2582 2869
2583sub mouse_motion { 2870sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2585 2872
… …
2593 2880
2594 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 2882 undef $GRAB;
2596 $self->hide; 2883 $self->hide;
2597 2884
2598 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2600 } 2887 }
2601} 2888}
2602 2889
2603############################################################################# 2890#############################################################################
2604 2891
2605package CFClient::UI::Statusbox; 2892package CFClient::UI::Statusbox;
2606 2893
2607our @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}
2608 2904
2609sub reorder { 2905sub reorder {
2610 my ($self) = @_; 2906 my ($self) = @_;
2611 my $NOW = time; 2907 my $NOW = time;
2612 2908
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2927 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2928 : $item->{text};
2633 2929
2634 for ($short) { 2930 for ($short) {
2635 s/^\s+//; 2931 s/^\s+//;
2636 s/\012.*/…/s; 2932 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2933 }
2640 2934
2641 new CFClient::UI::Label 2935 new CFClient::UI::Label
2642 markup => $short, 2936 markup => $short,
2643 tooltip => $item->{tooltip}, 2937 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2938 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2939 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2942 fg => $item->{fg},
2648 can_events => 1, 2943 can_events => 1,
2649 can_hover => 1 2944 can_hover => 1
2650 }; 2945 };
2651 } 2946 }
2652 2947
… …
2654 $self->SUPER::add (reverse @widgets); 2949 $self->SUPER::add (reverse @widgets);
2655} 2950}
2656 2951
2657sub add { 2952sub add {
2658 my ($self, $text, %arg) = @_; 2953 my ($self, $text, %arg) = @_;
2954
2955 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2659 2959
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2961
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2963
… …
2666 $item->{count}++; 2966 $item->{count}++;
2667 } else { 2967 } else {
2668 $item->{count} = 1; 2968 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2969 $item->{text} = $item->{tooltip} = $text;
2670 } 2970 }
2971 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2972 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2973 delete $item->{label};
2673 } else { 2974 } else {
2674 $self->{item}{$group} = { 2975 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2976 id => ++$self->{id},
2676 text => $text, 2977 text => $text,
2677 timeout => $timeout, 2978 timeout => $timeout,
2678 tooltip => $text, 2979 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2980 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2981 pri => 0,
2682 count => 1, 2982 count => 1,
2683 %arg, 2983 %arg,
2684 }; 2984 };
2685 } 2985 }
2686 2986
2687 $self->reorder; 2987 $self->reorder;
2688} 2988}
2689 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
2690############################################################################# 3000#############################################################################
2691 3001
2692package CFClient::UI::Root; 3002package CFClient::UI::Root;
2693 3003
2694our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
… …
2696use CFClient::OpenGL; 3006use CFClient::OpenGL;
2697 3007
2698sub new { 3008sub new {
2699 my $class = shift; 3009 my $class = shift;
2700 3010
2701 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
2702 @_, 3013 @_,
2703 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
2704} 3019}
2705 3020
2706sub configure { 3021sub configure {
2707 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2708 3023
2709 $self->{w} = $w; 3024 $self->{w} = $w;
2710 $self->{h} = $h; 3025 $self->{h} = $h;
2711} 3026}
2712 3027
2713sub check_size { 3028sub reconfigure {
2714 my ($self) = @_; 3029 my ($self) = @_;
2715 3030
3031 $self->SUPER::reconfigure;
3032
2716 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
2717 if $self->{w}; 3034 if $self->{w};
2718} 3035}
2719 3036
2720sub size_request { 3037sub size_request {
2721 my ($self) = @_; 3038 my ($self) = @_;
2722 3039
2723 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
2724} 3041}
2725 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
2726sub size_allocate { 3057sub size_allocate {
2727 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
2728
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744 3059
2745 for my $child ($self->children) { 3060 for my $child ($self->children) {
2746 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)};
2747 3062
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2749 $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
2750 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
2751 } 3070 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3071}
2756 3072
2757sub coord2local { 3073sub coord2local {
2758 my ($self, $x, $y) = @_; 3074 my ($self, $x, $y) = @_;
2759 3075
… …
2767} 3083}
2768 3084
2769sub update { 3085sub update {
2770 my ($self) = @_; 3086 my ($self) = @_;
2771 3087
2772 $self->check_size;
2773 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
2774} 3089}
2775 3090
2776sub add { 3091sub add {
2777 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2778 3093
2779 # integerise window positions 3094 $_->{is_toplevel} = 1
2780 $child->{x} = int $child->{x}; 3095 for @children;
2781 $child->{y} = int $child->{y};
2782 3096
2783 $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 }
2784} 3113}
2785 3114
2786sub on_refresh { 3115sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2788 3117
2789 $self->{refresh_hook}{$id} = $cb; 3118 $self->{refresh_hook}{$id} = $cb;
2790} 3119}
2791 3120
3121sub on_post_alloc {
3122 my ($self, $id, $cb) = @_;
3123
3124 $self->{post_alloc_hook}{$id} = $cb;
3125}
3126
2792sub draw { 3127sub draw {
2793 my ($self) = @_; 3128 my ($self) = @_;
2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839 3129
2840 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2841 $_->() 3131 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
2843 } 3133 }
2844 3134
3135 if ($self->{realloc}) {
3136 my @queue;
3137
3138 while () {
3139 if ($self->{realloc}) {
3140 #TODO use array-of-depth approach
3141
3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3144 }
3145
3146 my $widget = pop @queue || last;
3147
3148 $widget->{visible} or last; # do not resize invisible widgets
3149
3150 my ($w, $h) = $widget->size_request;
3151
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154
3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3158 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h;
3160
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3162
3163 push @queue, $widget->{parent}
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3165 }
3166 }
3167
3168 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177
3178 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0;
3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h, $changed);
3190 }
3191 }
3192
3193 while ($self->{post_alloc_hook}) {
3194 $_->()
3195 for values %{delete $self->{post_alloc_hook}};
3196 }
3197
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2848 3201
2849 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3203 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3206 glLoadIdentity;
2854 3207
2855 $self->_draw; 3208 $self->_draw;
2856} 3209}
… …
2858############################################################################# 3211#############################################################################
2859 3212
2860package CFClient::UI; 3213package CFClient::UI;
2861 3214
2862$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3217
28651 32181
2866 3219

Diff Legend

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