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.264 by root, Thu Jun 1 02:58:30 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->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
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->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
240 } 367 }
241} 368}
242 369
243sub size_allocate { 370sub size_allocate {
244 # nothing to be done 371 # nothing to be done
245} 372}
246 373
247sub children { 374sub children {
248} 375}
249 376
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 { 377sub set_max_size {
263 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
264 379
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
267} 398}
268 399
269# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
270sub coord2local { 401sub coord2local {
271 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
… …
286 return if $FOCUS == $self; 417 return if $FOCUS == $self;
287 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
288 419
289 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
290 421
291 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
292 423
293 $focus->update if $focus; 424 $focus->update if $focus;
294 $FOCUS->update; 425 $FOCUS->update;
295} 426}
296 427
… …
299 430
300 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
301 432
302 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
303 434
304 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
305 436
306 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
307} 441}
308 442
309sub mouse_motion { } 443sub mouse_motion { }
310sub button_up { } 444sub button_up { }
311sub key_down { } 445sub key_down { }
312sub key_up { } 446sub key_up { }
313 447
314sub button_down { 448sub button_down {
315 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
316 450
317 $self->focus_in; 451 $self->focus_in;
… …
320sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
321sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
322sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
323sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
324sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
325 529
326sub draw { 530sub draw {
327 my ($self) = @_; 531 my ($self) = @_;
328 532
329 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
346 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
347 glEnd; 551 glEnd;
348 glDisable GL_BLEND; 552 glDisable GL_BLEND;
349 } 553 }
350 554
351 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
352 glPushMatrix; 556 glPushMatrix;
353 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
354 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
356 glVertex 0 , 0; 560 glVertex 0 , 0;
357 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
358 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
359 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
360 glEnd; 564 glEnd;
361 glPopMatrix; 565 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 } 567 }
364} 568}
365 569
366sub _draw { 570sub _draw {
367 my ($self) = @_; 571 my ($self) = @_;
368 572
369 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
370} 574}
371 575
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 { 576sub DESTROY {
420 my ($self) = @_; 577 my ($self) = @_;
421 578
579 delete $WIDGET{$self+0};
422 #$self->deactivate; 580 #$self->deactivate;
423} 581}
424 582
425############################################################################# 583#############################################################################
426 584
… …
435 my $class = shift; 593 my $class = shift;
436 594
437 # range [value, low, high, page] 595 # range [value, low, high, page]
438 596
439 $class->SUPER::new ( 597 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
442 @_ 600 @_
443 ) 601 )
444} 602}
445 603
446sub _draw { 604sub _draw {
447 my ($self) = @_; 605 my ($self) = @_;
448 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
450 613
451 glEnable GL_BLEND; 614 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
454 617
455 glBegin GL_QUADS; 618 glBegin GL_QUADS;
456 glVertex 0 , 0; 619 glVertex 0 , 0;
457 glVertex 0 , $h; 620 glVertex 0 , $h;
458 glVertex $w, $h; 621 glVertex $w, $h;
459 glVertex $w, 0; 622 glVertex $w, 0;
460 glEnd; 623 glEnd;
461 624
462 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
463} 627}
464 628
465############################################################################# 629#############################################################################
466 630
467package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
474} 638}
475 639
476sub size_request { 640sub size_request {
477 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
478} 644}
479 645
480sub draw { } 646sub draw { }
481 647
482############################################################################# 648#############################################################################
… …
511 $self->{children} = [ 677 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
514 ]; 680 ];
515 681
516 $self->check_size (1); 682 $self->realloc;
517 $self->update;
518} 683}
519 684
520sub children { 685sub children {
521 @{ $_[0]{children} } 686 @{ $_[0]{children} }
522} 687}
… …
527 delete $child->{parent}; 692 delete $child->{parent};
528 $child->hide; 693 $child->hide;
529 694
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 696
532 $self->check_size; 697 $self->realloc;
533 $self->update;
534} 698}
535 699
536sub clear { 700sub clear {
537 my ($self) = @_; 701 my ($self) = @_;
538 702
… …
542 for (@$children) { 706 for (@$children) {
543 delete $_->{parent}; 707 delete $_->{parent};
544 $_->hide; 708 $_->hide;
545 } 709 }
546 710
547 $self->check_size; 711 $self->realloc;
548 $self->update;
549} 712}
550 713
551sub find_widget { 714sub find_widget {
552 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
553 716
… …
628} 791}
629 792
630sub update { 793sub update {
631 my ($self) = @_; 794 my ($self) = @_;
632 795
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 797 $self->SUPER::update;
635} 798}
636 799
637sub size_allocate { 800sub size_allocate {
638 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
… …
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
654 817
655 $self->_render; 818 $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 }; 819 };
664} 820}
665 821
666sub _draw { 822sub _draw {
667 my ($self) = @_; 823 my ($self) = @_;
… …
671 my $tex = $self->{texture} 827 my $tex = $self->{texture}
672 or return; 828 or return;
673 829
674 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
677 833
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 835
680 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
681} 837}
… …
684 840
685package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
686 842
687our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
688 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
689sub size_request { 855sub size_request {
690 my ($self) = @_; 856 my ($self) = @_;
691 857
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 859
695 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
696} 864}
697 865
698sub size_allocate { 866sub size_allocate {
699 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
700 868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
701 $self->update; 875 $self->update;
702} 876}
703 877
704sub set_offset { 878sub set_offset {
705 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 930 my $class = shift;
757 931
758 my $self; 932 my $self;
759 933
760 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
761 vertical => 1, 935 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 937 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
765 }, 939 },
766 ; 940 ;
767 941
768 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 944 slider => $slider,
771 @_, 945 @_,
772 ); 946 );
773 947
774 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
777 951
778 $self 952 $self
779} 953}
780 954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
781#TODO# update range on size_allocate depeneing on child 974#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 975# update viewport offset on scroll
783 976
784############################################################################# 977#############################################################################
785 978
786package CFClient::UI::Frame; 979package CFClient::UI::Frame;
787 980
788our @ISA = CFClient::UI::Bin::; 981our @ISA = CFClient::UI::Bin::;
789 982
790use CFClient::OpenGL; 983use 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 984
804sub new { 985sub new {
805 my $class = shift; 986 my $class = shift;
806 987
807 # TODO: user_x, user_y, overwrite moveto? 988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
808 1035
809 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
812 border => 0.6, 1039 border => 0.6,
813 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
814 @_ 1043 @_
815 ); 1044 );
816 1045
817 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
818 align => 0, 1047 align => 0,
… …
842 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
843 1072
844 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
846 1075
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848 if $self->{title}; 1077 if $self->{title};
849 1078
850 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
851} 1080}
852 1081
… …
871 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
872 1101
873 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
875 1104
876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
879 $self->check_size;
880 }; 1110 };
881 1111
882 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
883 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
884 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
886 $self->{motion} = sub { 1116 $self->{motion} = sub {
887 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
888 1118
889 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
890 1120
891 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
892 $self->update;
893 }; 1122 };
894 } 1123 }
895} 1124}
896 1125
897sub button_up { 1126sub button_up {
… …
916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
917 1146
918 my $border = $self->border; 1147 my $border = $self->border;
919 1148
920 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
921 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
925 1154
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
927 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
928 1157
929 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
930 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
931 my $rep_y = $ch / $bg->{h}; 1161 $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); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 } 1163 }
940 1164
941 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
942 1166
… …
958sub new { 1182sub new {
959 my $class = shift; 1183 my $class = shift;
960 1184
961 $class->SUPER::new ( 1185 $class->SUPER::new (
962 col_expand => [], 1186 col_expand => [],
963 @_ 1187 @_,
964 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
965} 1193}
966 1194
967sub add { 1195sub add {
968 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
969 1197
970 $child->set_parent ($self); 1198 $child->set_parent ($self);
971 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
972 1200
973 $child->check_size; 1201 $self->realloc;
974} 1202}
975 1203
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
980# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
981sub clear { 1205sub clear {
982 my ($self) = @_; 1206 my ($self) = @_;
983 1207
984 my @children = $self->children; 1208 my @children = $self->children;
985 delete $self->{children}; 1209 delete $self->{children};
… …
987 for (@children) { 1211 for (@children) {
988 delete $_->{parent}; 1212 delete $_->{parent};
989 $_->hide; 1213 $_->hide;
990 } 1214 }
991 1215
992 $self->update; 1216 $self->realloc;
993} 1217}
994 1218
995sub get_wh { 1219sub get_wh {
996 my ($self) = @_; 1220 my ($self) = @_;
997 1221
… …
1028sub size_allocate { 1252sub size_allocate {
1029 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1030 1254
1031 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1032 1256
1033 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1034 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1035 1259
1036 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1037 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1038 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1039 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1093 } 1317 }
1094} 1318}
1095 1319
1096############################################################################# 1320#############################################################################
1097 1321
1098package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1099
1100# TODO: wrap into common Box base class
1101 1323
1102our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1103 1325
1104sub size_request { 1326sub size_request {
1105 my ($self) = @_; 1327 my ($self) = @_;
1106 1328
1107 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1108 1330 ? (
1109 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1110 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111 (List::Util::max map $_->[1], @alloc), 1333 )
1112 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1113} 1338}
1114 1339
1115sub size_allocate { 1340sub size_allocate {
1116 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1117 1342
1118 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1119
1120 my $children = $self->{children}; 1344 my $children = $self->{children};
1121 1345
1122 my @h = map $_->{req_w}, @$children; 1346 my @req;
1123 1347
1124 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1125 1349 @req = ($space / (@$children || 1)) x @$children;
1126 if ($req_h > $h) {
1127 # ah well, not enough space
1128 $_ *= $h / $req_h for @h;
1129 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1130 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131 $exp ||= 1;
1132 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1133 for (0 .. $#$children) { 1363 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 } 1364 }
1140 } 1365 }
1141 1366
1142 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1143 1368
1144 my $y = 0; 1369 my $pos = 0;
1145 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1146 my $child = $children->[$_];
1147 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1148 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149 1373
1150 $y += $h; 1374 $pos += $alloc;
1151 } 1375 }
1152 1376
1153 1 1377 1
1154} 1378}
1155 1379
1156############################################################################# 1380#############################################################################
1157 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1158package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1159 1398
1160# TODO: wrap into common Box base class
1161
1162our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1163 1400
1164sub size_request { 1401sub new {
1165 my ($self) = @_; 1402 my $class = shift;
1166 1403
1167 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1168 1405 vertical => 1,
1169 ( 1406 @_,
1170 (List::Util::max map $_->[0], @alloc),
1171 (List::Util::sum map $_->[1], @alloc),
1172 ) 1407 )
1173} 1408}
1174 1409
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############################################################################# 1410#############################################################################
1215 1411
1216package CFClient::UI::Label; 1412package CFClient::UI::Label;
1217 1413
1218our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1219 1415
1220use CFClient::OpenGL; 1416use CFClient::OpenGL;
1221 1417
1222sub new { 1418sub new {
1223 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1224 1420
1225 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1227 #font => default_font 1425 #font => default_font
1228 #text => initial text 1426 #text => initial text
1229 #markup => initial narkup 1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1231 fontsize => 1, 1431 fontsize => 1,
1232 align => -1, 1432 align => -1,
1233 valign => -1, 1433 valign => -1,
1234 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1235 can_events => 0, 1436 can_events => 0,
1236 %arg 1437 %arg
1237 ); 1438 );
1238 1439
1239 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1249 } 1450 }
1250 1451
1251 $self 1452 $self
1252} 1453}
1253 1454
1254sub escape { 1455sub escape($) {
1255 local $_ = $_[1]; 1456 local $_ = $_[0];
1256 1457
1257 s/&/&amp;/g; 1458 s/&/&amp;/g;
1258 s/>/&gt;/g; 1459 s/>/&gt;/g;
1259 s/</&lt;/g; 1460 s/</&lt;/g;
1260 1461
1261 $_[1] 1462 $_
1262} 1463}
1263 1464
1264sub update { 1465sub update {
1265 my ($self) = @_; 1466 my ($self) = @_;
1266 1467
… …
1275 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1276 1477
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1279 1480
1481 $self->realloc;
1280 $self->update; 1482 $self->update;
1281 $self->check_size;
1282} 1483}
1283 1484
1284sub set_markup { 1485sub set_markup {
1285 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1286 1487
… …
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291 1492
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1293 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1294 1495
1496 $self->realloc;
1295 $self->update; 1497 $self->update;
1296 $self->check_size;
1297} 1498}
1298 1499
1299sub size_request { 1500sub size_request {
1300 my ($self) = @_; 1501 my ($self) = @_;
1301 1502
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1508
1306 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1307 1510
1308 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1313 1516
1314 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1315 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1316 } 1519 }
1317 1520
1318 ( 1521 ($w, $h)
1319 $w + $self->{padding} * 2,
1320 $h + $self->{padding} * 2,
1321 )
1322} 1522}
1323 1523
1324sub size_allocate { 1524sub size_allocate {
1325 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1326 1526
1327 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1328} 1529}
1329 1530
1330sub set_fontsize { 1531sub set_fontsize {
1331 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1332 1533
1333 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1334 delete $self->{texture}; 1535 delete $self->{texture};
1335 1536
1336 $self->update; 1537 $self->realloc;
1337 $self->check_size;
1338} 1538}
1339 1539
1340sub _draw { 1540sub _draw {
1341 my ($self) = @_; 1541 my ($self) = @_;
1542
1543 $self->SUPER::_draw; # draw background, if applicable
1342 1544
1343 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1546 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 1548 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1552
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1554
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1557 : ($self->{w} - $tex->{w}) * 0.5);
1354 1558
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1561 : ($self->{h} - $tex->{h}) * 0.5);
1358 1562
1359 $tex 1563 $tex
1360 }; 1564 };
1361 1565
1362 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
… …
1390 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1391 can_hover => 1, 1595 can_hover => 1,
1392 can_focus => 1, 1596 can_focus => 1,
1393 valign => 0, 1597 valign => 0,
1394 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1395 @_ 1600 @_
1396 ) 1601 )
1397} 1602}
1398 1603
1399sub _set_text { 1604sub _set_text {
… …
1409 $self->{text} = $text; 1614 $self->{text} = $text;
1410 1615
1411 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1413 1618
1414 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1415} 1620}
1416 1621
1417sub set_text { 1622sub set_text {
1418 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1419 1624
1420 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1626 $self->_set_text ($text);
1422 $self->check_size; 1627
1423 $self->update; 1628 $self->realloc;
1424} 1629}
1425 1630
1426sub get_text { 1631sub get_text {
1427 $_[0]{text} 1632 $_[0]{text}
1428} 1633}
… …
1431 my ($self) = @_; 1636 my ($self) = @_;
1432 1637
1433 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1434 1639
1435 ($w + 1, $h) # add 1 for cursor 1640 ($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} 1641}
1443 1642
1444sub key_down { 1643sub key_down {
1445 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1446 1645
… …
1448 my $sym = $ev->{sym}; 1647 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1648 my $uni = $ev->{unicode};
1450 1649
1451 my $text = $self->get_text; 1650 my $text = $self->get_text;
1452 1651
1453 if ($sym == 8) { 1652 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1654 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1664 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1665 $self->_emit ('escape');
1467 } elsif ($uni) { 1666 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1668 }
1470 1669
1471 $self->_set_text ($text); 1670 $self->_set_text ($text);
1472 $self->update; 1671
1672 $self->realloc;
1473} 1673}
1474 1674
1475sub focus_in { 1675sub focus_in {
1476 my ($self) = @_; 1676 my ($self) = @_;
1477 1677
… …
1557 if ($sym == 13) { 1757 if ($sym == 13) {
1558 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1563 $self->update; 1763 $self->update;
1564 1764
1565 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1604 1804
1605sub new { 1805sub new {
1606 my $class = shift; 1806 my $class = shift;
1607 1807
1608 $class->SUPER::new ( 1808 $class->SUPER::new (
1609 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1610 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1613 can_hover => 1, 1813 can_hover => 1,
1614 align => 0, 1814 align => 0,
1615 valign => 0, 1815 valign => 0,
1616 can_events => 1, 1816 can_events => 1,
1617 @_ 1817 @_
1618 ) 1818 )
1619} 1819}
1620 1820
1821sub activate { }
1822
1621sub button_up { 1823sub button_up {
1622 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1623 1825
1826 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate");
1627 }
1628} 1829}
1629 1830
1630sub _draw { 1831sub _draw {
1631 my ($self) = @_; 1832 my ($self) = @_;
1632 1833
… …
1661 1862
1662sub new { 1863sub new {
1663 my $class = shift; 1864 my $class = shift;
1664 1865
1665 $class->SUPER::new ( 1866 $class->SUPER::new (
1666 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1667 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1871 bg => [0, 0, 0, 0.2],
1872 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 1873 state => 0,
1670 can_hover => 1, 1874 can_hover => 1,
1671 @_ 1875 @_
1672 ) 1876 )
1673} 1877}
1674 1878
1675sub size_request { 1879sub size_request {
1676 my ($self) = @_; 1880 my ($self) = @_;
1677 1881
1678 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1679} 1883}
1680 1884
1681sub button_down { 1885sub button_down {
1682 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1683 1887
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1686 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1687 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1688 } 1892 }
1689} 1893}
1690 1894
1691sub _draw { 1895sub _draw {
1692 my ($self) = @_; 1896 my ($self) = @_;
1693 1897
1694 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1695 1899
1696 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1697 1901
1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1699 1905
1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1701 1907
1702 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703 1909
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1958 2164
1959sub new { 2165sub new {
1960 my $class = shift; 2166 my $class = shift;
1961 2167
1962 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1963 2169
1964 # TODO: 0-width page 2170 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2172 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
1973 vertical => 0, 2181 vertical => 0,
1974 can_hover => 1, 2182 can_hover => 1,
1975 inner_pad => 5, 2183 inner_pad => 0.02,
1976 @_ 2184 @_
1977 ); 2185 );
1978 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1979 $self 2190 $self
1980} 2191}
1981 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2204sub set_value {
2205 my ($self, $value) = @_;
2206
2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2208
2209 $hi = $lo + 1 if $hi <= $lo;
2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2213 $value = $lo if $value < $lo;
2214 $value = $hi - $page if $value > $hi - $page;
2215
2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2217 if $unit;
2218
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220
2221 if ($value != $old_value) {
2222 $self->_emit (changed => $value);
2223 $self->update;
2224 }
2225}
2226
1982sub size_request { 2227sub size_request {
1983 my ($self) = @_; 2228 my ($self) = @_;
1984 2229
1985 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
1986 my $h = $self->{req_h};
1987
1988 $self->{vertical} ? ($h, $w) : ($w, $h)
1989} 2231}
1990 2232
1991sub button_down { 2233sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
1993 2235
1994 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
1995 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
1996} 2241}
1997 2242
1998sub mouse_motion { 2243sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
2000 2245
2001 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248
2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2254 }
2255}
2256
2257sub update {
2258 my ($self) = @_;
2259
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2261 $self->set_value ($self->{range}[0]);
2262
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
2003 2265
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2267
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $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 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2270
2009 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $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 2273
2015 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2275 $self->{knob_w} = $knob_w;
2017 } 2276 });
2018}
2019 2277
2020# the inner_* stuff is for generating a padding for the slider handle, 2278 $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} 2279}
2027 2280
2028sub _draw { 2281sub _draw {
2029 my ($self) = @_; 2282 my ($self) = @_;
2030 2283
2031 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
2032 2285
2033 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
2034 2287
2035 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
2037 2290
2291 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2293 }
2043 2294
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2297
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; 2298 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2300
2068 # draw background 2301 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2303
2071 # draw handle 2304 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2306
2074 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2075} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
2076 2350
2077############################################################################# 2351#############################################################################
2078 2352
2079package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2080 2354
… …
2110 2384
2111 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2386 $self->reflow;
2113} 2387}
2114 2388
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 { 2389sub size_allocate {
2135 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
2136 2391
2137 $self->SUPER::size_allocate ($w, $h); 2392 $self->SUPER::size_allocate ($w, $h);
2138 2393
… …
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2397
2143 $self->reflow; 2398 $self->reflow;
2144} 2399}
2145 2400
2401sub text_size {
2402 my ($self, $text, $indent) = @_;
2403
2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent);
2408 $layout->set_markup ($text);
2409
2410 $layout->size
2411}
2412
2413sub reflow {
2414 my ($self) = @_;
2415
2416 $self->{need_reflow}++;
2417 $self->update;
2418}
2419
2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
2428 my ($self) = @_;
2429
2430 $self->{par} = [];
2431 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433}
2434
2146sub add_paragraph { 2435sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2148 2437
2149 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
2150 2439 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
2154 2443
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158 $self->{children}[1]->update;
2159} 2445}
2160 2446
2161sub update { 2447sub update {
2162 my ($self) = @_; 2448 my ($self) = @_;
2163 2449
… …
2165 2451
2166 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2167 2453
2168 delete $self->{texture}; 2454 delete $self->{texture};
2169 2455
2170 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2171 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2460 my $height = 0;
2173 2461
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2175 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2176 2477
2177 $self->{height} = $height; 2478 $self->{height} = $height;
2178 2479
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2481
2181 delete $self->{texture}; 2482 delete $self->{texture};
2182 } 2483 }
2183 2484
2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185 glClearColor 0, 0, 0, 0; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2187 2488
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]; 2489 my $top = int $self->{children}[1]{range}[0];
2192 2490
2193 my $y0 = $top; 2491 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2492 my $y1 = $top + $H;
2195 2493
2196 my $y = 0; 2494 my $y = 0;
2197 2495
2198 my $layout = $self->{layout}; 2496 my $layout = $self->{layout};
2199 2497
2200 $layout->set_font ($self->{font}) if $self->{font}; 2498 $layout->set_font ($self->{font}) if $self->{font};
2201 2499
2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2503
2202 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2505 my $h = $par->[1];
2204 2506
2205 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2208 2511
2209 my ($W, $H) = $layout->size; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2513
2514 glRasterPos $par->[3], $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211 } 2516 }
2212 2517
2213 $y += $h; 2518 $y += $h;
2214 } 2519 }
2215 2520
2216 glDisable GL_TEXTURE_2D; 2521 glDisable GL_BLEND;
2217 }; 2522 };
2218 }); 2523 });
2219} 2524}
2220 2525
2221sub _draw { 2526sub _draw {
2222 my ($self) = @_; 2527 my ($self) = @_;
2223 2528
2224 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2531 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2229 2534
2230 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2231 2536
2232} 2537}
… …
2281 2586
2282sub new { 2587sub new {
2283 my $class = shift; 2588 my $class = shift;
2284 2589
2285 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2286 state => 0, 2591 state => 0,
2287 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2288 @_ 2593 @_
2289 ); 2594 );
2290 2595
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2596 $self
2297} 2597}
2298 2598
2299sub toggle_flopper { 2599sub toggle_flopper {
2300 my ($self) = @_; 2600 my ($self) = @_;
2301 2601
2302 # TODO: use animation 2602 $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} 2603}
2314 2604
2315############################################################################# 2605#############################################################################
2316 2606
2317package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2330} 2620}
2331 2621
2332sub set_tooltip_from { 2622sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2334 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2335 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2637 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2639 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2641 );
2342} 2642}
2343 2643
2344sub size_request { 2644sub size_request {
2345 my ($self) = @_; 2645 my ($self) = @_;
… …
2351 2651
2352sub size_allocate { 2652sub size_allocate {
2353 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2354 2654
2355 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2356} 2674}
2357 2675
2358sub _draw { 2676sub _draw {
2359 my ($self) = @_; 2677 my ($self) = @_;
2360 2678
… …
2377 glVertex $w, $h; 2695 glVertex $w, $h;
2378 glVertex $w, 0; 2696 glVertex $w, 0;
2379 glEnd; 2697 glEnd;
2380 2698
2381 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2382 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2383} 2702}
2384 2703
2385############################################################################# 2704#############################################################################
2386 2705
… …
2391use CFClient::OpenGL; 2710use CFClient::OpenGL;
2392 2711
2393sub new { 2712sub new {
2394 my $class = shift; 2713 my $class = shift;
2395 2714
2396 $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2397 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2398 @_, 2718 @_,
2399 ) 2719 );
2720
2721 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self);
2723
2724 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1,
2727 interval => $self->{animspeed},
2728 cb => sub {
2729 ++$widget->{frame};
2730 $widget->update;
2731 },
2732 );
2733 }
2734
2735 $self
2400} 2736}
2401 2737
2402sub size_request { 2738sub size_request {
2403 (32, 8) 2739 (32, 8)
2404} 2740}
2405 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2406sub _draw { 2750sub _draw {
2407 my ($self) = @_; 2751 my ($self) = @_;
2408 2752
2409 return unless $::CONN;#d# manage and cache textures differently 2753 return unless $::CONN;
2754
2755 my $face;
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2765
2412 # TODO animation
2413 if ($tex) { 2766 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2767 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2769 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2419 } 2772 }
2420} 2773}
2421 2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2782}
2783
2422############################################################################# 2784#############################################################################
2423 2785
2424package CFClient::UI::InventoryItem; 2786package CFClient::UI::Inventory;
2425 2787
2426our @ISA = CFClient::UI::HBox::; 2788our @ISA = CFClient::UI::ScrolledWindow::;
2427 2789
2428sub new { 2790sub new {
2429 my $class = shift; 2791 my $class = shift;
2430 2792
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 ( 2793 my $self = $class->SUPER::new (
2441 can_hover => 1, 2794 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 @_, 2795 @_,
2500 ); 2796 );
2501 2797
2502 $self 2798 $self
2503} 2799}
… …
2506 my ($self, $items) = @_; 2802 my ($self, $items) = @_;
2507 2803
2508 $self->{scrolled}->clear; 2804 $self->{scrolled}->clear;
2509 return unless $items; 2805 return unless $items;
2510 2806
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2807 my @items = sort {
2808 ($a->{type} <=> $b->{type})
2809 or ($a->{name} cmp $b->{name})
2810 } @$items;
2512 2811
2513 $self->{real_items} = \@items; 2812 $self->{real_items} = \@items;
2514 2813
2814 my $row = 0;
2515 for my $item (@items) { 2815 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2 2816 CFClient::Item::update_widgets $item;
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519 2817
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2818 $self->{scrolled}->add (0, $row, $item->{face_widget});
2521 } 2819 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2820 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2522 2821
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2822 $row++;
2524} 2823 }
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529} 2824}
2530 2825
2531############################################################################# 2826#############################################################################
2532 2827
2533package CFClient::UI::Menu; 2828package CFClient::UI::Menu;
… …
2568 2863
2569# popup given the event (must be a mouse button down event currently) 2864# popup given the event (must be a mouse button down event currently)
2570sub popup { 2865sub popup {
2571 my ($self, $ev) = @_; 2866 my ($self, $ev) = @_;
2572 2867
2573 $self->emit ("popdown"); 2868 $self->_emit ("popdown");
2574 2869
2575 # maybe save $GRAB? must be careful about events... 2870 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 2871 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 2872 $self->{button} = $ev->{button};
2578 2873
2579 $self->show; 2874 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2875 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581} 2876}
2582 2877
2583sub mouse_motion { 2878sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2585 2880
… …
2593 2888
2594 if ($ev->{button} == $self->{button}) { 2889 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 2890 undef $GRAB;
2596 $self->hide; 2891 $self->hide;
2597 2892
2598 $self->emit ("popdown"); 2893 $self->_emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 2894 $self->{hover}[1]->() if $self->{hover};
2600 } 2895 }
2601} 2896}
2602 2897
2603############################################################################# 2898#############################################################################
2604 2899
2605package CFClient::UI::Statusbox; 2900package CFClient::UI::Statusbox;
2606 2901
2607our @ISA = CFClient::UI::VBox::; 2902our @ISA = CFClient::UI::VBox::;
2903
2904sub new {
2905 my $class = shift;
2906
2907 $class->SUPER::new (
2908 fontsize => 0.8,
2909 @_,
2910 )
2911}
2608 2912
2609sub reorder { 2913sub reorder {
2610 my ($self) = @_; 2914 my ($self) = @_;
2611 my $NOW = time; 2915 my $NOW = time;
2612 2916
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2935 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2936 : $item->{text};
2633 2937
2634 for ($short) { 2938 for ($short) {
2635 s/^\s+//; 2939 s/^\s+//;
2636 s/\012.*/…/s; 2940 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2941 }
2640 2942
2641 new CFClient::UI::Label 2943 new CFClient::UI::Label
2642 markup => $short, 2944 markup => $short,
2643 tooltip => $item->{tooltip}, 2945 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2946 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2947 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2948 fontsize => $item->{fontsize} || $self->{fontsize},
2949 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2950 fg => $item->{fg},
2648 can_events => 1, 2951 can_events => 1,
2649 can_hover => 1 2952 can_hover => 1
2650 }; 2953 };
2651 } 2954 }
2652 2955
… …
2654 $self->SUPER::add (reverse @widgets); 2957 $self->SUPER::add (reverse @widgets);
2655} 2958}
2656 2959
2657sub add { 2960sub add {
2658 my ($self, $text, %arg) = @_; 2961 my ($self, $text, %arg) = @_;
2962
2963 $text =~ s/^\s+//;
2964 $text =~ s/\s+$//;
2965
2966 return unless $text;
2659 2967
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2968 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2969
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2970 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2971
… …
2666 $item->{count}++; 2974 $item->{count}++;
2667 } else { 2975 } else {
2668 $item->{count} = 1; 2976 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2977 $item->{text} = $item->{tooltip} = $text;
2670 } 2978 }
2979 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2980 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2981 delete $item->{label};
2673 } else { 2982 } else {
2674 $self->{item}{$group} = { 2983 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2984 id => ++$self->{id},
2676 text => $text, 2985 text => $text,
2677 timeout => $timeout, 2986 timeout => $timeout,
2678 tooltip => $text, 2987 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2988 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2989 pri => 0,
2682 count => 1, 2990 count => 1,
2683 %arg, 2991 %arg,
2684 }; 2992 };
2685 } 2993 }
2686 2994
2687 $self->reorder; 2995 $self->reorder;
2688} 2996}
2689 2997
2998sub reconfigure {
2999 my ($self) = @_;
3000
3001 delete $_->{label}
3002 for values %{ $self->{item} || {} };
3003
3004 $self->reorder;
3005 $self->SUPER::reconfigure;
3006}
3007
2690############################################################################# 3008#############################################################################
2691 3009
2692package CFClient::UI::Root; 3010package CFClient::UI::Root;
2693 3011
2694our @ISA = CFClient::UI::Container::; 3012our @ISA = CFClient::UI::Container::;
… …
2696use CFClient::OpenGL; 3014use CFClient::OpenGL;
2697 3015
2698sub new { 3016sub new {
2699 my $class = shift; 3017 my $class = shift;
2700 3018
2701 $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
3020 visible => 1,
2702 @_, 3021 @_,
2703 ) 3022 );
2704}
2705 3023
2706sub configure { 3024 Scalar::Util::weaken ($self->{root} = $self);
2707 my ($self, $x, $y, $w, $h) = @_;
2708 3025
2709 $self->{w} = $w; 3026 $self
2710 $self->{h} = $h;
2711}
2712
2713sub check_size {
2714 my ($self) = @_;
2715
2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2718} 3027}
2719 3028
2720sub size_request { 3029sub size_request {
2721 my ($self) = @_; 3030 my ($self) = @_;
2722 3031
2723 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
3033}
3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
2724} 3047}
2725 3048
2726sub size_allocate { 3049sub size_allocate {
2727 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h) = @_;
2728 3051
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
2745 for my $child ($self->children) { 3052 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 3054
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3055 $X = $child->{force_x} if exists $child->{force_x};
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3056 $Y = $child->{force_y} if exists $child->{force_y};
3057
3058 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h};
3060
2750 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
2751 } 3062 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3063}
2756 3064
2757sub coord2local { 3065sub coord2local {
2758 my ($self, $x, $y) = @_; 3066 my ($self, $x, $y) = @_;
2759 3067
… …
2767} 3075}
2768 3076
2769sub update { 3077sub update {
2770 my ($self) = @_; 3078 my ($self) = @_;
2771 3079
2772 $self->check_size;
2773 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
2774} 3081}
2775 3082
2776sub add { 3083sub add {
2777 my ($self, $child) = @_; 3084 my ($self, @children) = @_;
2778 3085
2779 # integerise window positions 3086 $_->{is_toplevel} = 1
2780 $child->{x} = int $child->{x}; 3087 for @children;
2781 $child->{y} = int $child->{y};
2782 3088
2783 $self->SUPER::add ($child); 3089 $self->SUPER::add (@children);
3090}
3091
3092sub remove {
3093 my ($self, @children) = @_;
3094
3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3099
3100 while (@children) {
3101 my $w = pop @children;
3102 push @children, $w->children;
3103 $w->set_invisible;
3104 }
2784} 3105}
2785 3106
2786sub on_refresh { 3107sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3108 my ($self, $id, $cb) = @_;
2788 3109
2789 $self->{refresh_hook}{$id} = $cb; 3110 $self->{refresh_hook}{$id} = $cb;
2790} 3111}
2791 3112
3113sub on_post_alloc {
3114 my ($self, $id, $cb) = @_;
3115
3116 $self->{post_alloc_hook}{$id} = $cb;
3117}
3118
2792sub draw { 3119sub draw {
2793 my ($self) = @_; 3120 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 3121
2840 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
2841 $_->() 3123 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
2843 } 3125 }
2844 3126
3127 if ($self->{realloc}) {
3128 my @queue;
3129
3130 while () {
3131 if ($self->{realloc}) {
3132 #TODO use array-of-depth approach
3133
3134 use sort 'stable';
3135
3136 @queue = sort { $a->{visible} <=> $b->{visible} }
3137 @queue, values %{delete $self->{realloc}};
3138 }
3139
3140 my $widget = pop @queue || last;
3141
3142 $widget->{visible} or last; # do not resize invisible widgets
3143
3144 my ($w, $h) = $widget->size_request;
3145
3146 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
3152 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3153 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h;
3156
3157 $self->{size_alloc}{$widget+0} = $widget;
3158
3159 if (my $parent = $widget->{parent}) {
3160 $self->{realloc}{$parent+0} = $parent;
3161 #unshift @queue, $parent;
3162 $parent->{force_size_alloc} = 1;
3163 $self->{size_alloc}{$parent+0} = $parent;
3164 }
3165 }
3166
3167 delete $self->{realloc}{$widget+0};
3168 }
3169 }
3170
3171 while (my $size_alloc = delete $self->{size_alloc}) {
3172 my @queue = sort { $b->{visible} <=> $a->{visible} }
3173 values %$size_alloc;
3174
3175 while () {
3176 my $widget = pop @queue || last;
3177
3178 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3179
3180 $w = 0 if $w < 0;
3181 $h = 0 if $h < 0;
3182
3183 $w = int $w + 0.5;
3184 $h = int $h + 0.5;
3185
3186 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3187 $widget->{w} = $w;
3188 $widget->{h} = $h;
3189
3190 $widget->emit (size_allocate => $w, $h);
3191 }
3192 }
3193 }
3194
3195 while ($self->{post_alloc_hook}) {
3196 $_->()
3197 for values %{delete $self->{post_alloc_hook}};
3198 }
3199
3200
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
2848 3204
2849 glMatrixMode GL_PROJECTION; 3205 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3206 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3208 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3209 glLoadIdentity;
2854 3210
2855 $self->_draw; 3211 $self->_draw;
2856} 3212}
2857 3213
2858############################################################################# 3214#############################################################################
2859 3215
3216package CFClient::UI::SpellList;
3217
3218our @ISA = CFClient::UI::FancyFrame::;
3219
3220sub new {
3221 my $class = shift;
3222
3223 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225 $self->add (new CFClient::UI::ScrolledWindow
3226 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228 $self;
3229}
3230
3231# XXX: Do sorting? Argl...
3232sub add_spell {
3233 my ($self, $spell) = @_;
3234 $self->{spells}->{$spell->{name}} = $spell;
3235
3236 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3237 face => $spell->{face},
3238 can_hover => 1,
3239 can_events => 1,
3240 tooltip => $spell->{message});
3241
3242 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3243 text => $spell->{name},
3244 can_hover => 1,
3245 can_events => 1,
3246 tooltip => $spell->{message},
3247 expand => 1);
3248
3249 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3252 expand => 1);
3253
3254 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3255 text => "bind to key",
3256 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3257}
3258
3259sub rebuild_spell_list {
3260 my ($self) = @_;
3261 $self->{tbl_idx} = 0;
3262 $self->add_spell ($_) for values %{$self->{spells}};
3263}
3264
3265sub remove_spell {
3266 my ($self, $spell) = @_;
3267 delete $self->{spells}->{$spell->{name}};
3268 $self->rebuild_spell_list;
3269}
3270
3271#############################################################################
3272
3273package CFClient::UI::BindEditor;
3274
3275our @ISA = CFClient::UI::FancyFrame::;
3276
3277sub new {
3278 my $class = shift;
3279
3280 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3281
3282 $self->add (my $vb = new CFClient::UI::VBox);
3283
3284
3285 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3286 text => "start recording",
3287 tooltip => "Start/Stops recording of actions."
3288 ."All subsequent actions after the recording started will be captured."
3289 ."The actions are displayed after the record was stopped."
3290 ."To bind the action you have to click on the 'Bind' button",
3291 on_activate => sub {
3292 unless ($self->{recording}) {
3293 $self->start;
3294 } else {
3295 $self->stop;
3296 }
3297 });
3298
3299 $vb->add (new CFClient::UI::Label text => "Actions:");
3300 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3301
3302 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3305 $hb->add (new CFClient::UI::Button
3306 text => "bind",
3307 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3308 on_activate => sub {
3309 $self->ask_for_bind;
3310 });
3311
3312 $vb->add (my $hb = new CFClient::UI::HBox);
3313 $hb->add (new CFClient::UI::Button
3314 text => "ok",
3315 expand => 1,
3316 tooltip => "This closes the binding editor and saves the binding",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->commit;
3320 });
3321
3322 $hb->add (new CFClient::UI::Button
3323 text => "cancel",
3324 expand => 1,
3325 tooltip => "This closes the binding editor without saving",
3326 on_activate => sub {
3327 $self->hide;
3328 $self->{binding_cancel}->()
3329 if $self->{binding_cancel};
3330 });
3331
3332 $self->update_binding_widgets;
3333
3334 $self
3335}
3336
3337sub commit {
3338 my ($self) = @_;
3339 my ($mod, $sym, $cmds) = $self->get_binding;
3340 if ($sym != 0 && @$cmds > 0) {
3341 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3342 ."'. Don't forget 'Save Config'!");
3343 $self->{binding_change}->($mod, $sym, $cmds)
3344 if $self->{binding_change};
3345 } else {
3346 $::STATUSBOX->add ("No action bound, no key or action specified!");
3347 $self->{binding_cancel}->()
3348 if $self->{binding_cancel};
3349 }
3350}
3351
3352sub start {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("stop recording");
3356 $self->{recording} = 1;
3357 $self->clear_command_list;
3358 $::CONN->start_record if $::CONN;
3359}
3360
3361sub stop {
3362 my ($self) = @_;
3363
3364 $self->{rec_btn}->set_text ("start recording");
3365 $self->{recording} = 0;
3366
3367 my $rec;
3368 $rec = $::CONN->stop_record if $::CONN;
3369 return unless ref $rec eq 'ARRAY';
3370 $self->set_command_list ($rec);
3371}
3372
3373# if $commit is true, the binding will be set after the user entered a key combo
3374sub ask_for_bind {
3375 my ($self, $commit) = @_;
3376
3377 CFClient::Binder::open_binding_dialog (sub {
3378 my ($mod, $sym) = @_;
3379 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3380 $self->update_binding_widgets;
3381 $self->commit if $commit;
3382 });
3383}
3384
3385# $mod and $sym are the modifiers and key symbol
3386# $cmds is a array ref of strings (the commands)
3387# $cb is the callback that is executed on OK
3388# $ccb is the callback that is executed on CANCEL and
3389# when the binding was unsuccessful on OK
3390sub set_binding {
3391 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3392
3393 $self->clear_command_list;
3394 $self->{recording} = 0;
3395 $self->{rec_btn}->set_text ("start recording");
3396
3397 $self->{binding} = [$mod, $sym];
3398 $self->{commands} = $cmds;
3399
3400 $self->{binding_change} = $cb;
3401 $self->{binding_cancel} = $ccb;
3402
3403 $self->update_binding_widgets;
3404}
3405
3406# this is a shortcut method that asks for a binding
3407# and then just binds it.
3408sub do_quick_binding {
3409 my ($self, $cmds) = @_;
3410 $self->set_binding (undef, undef, $cmds, sub {
3411 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3412 });
3413 $self->ask_for_bind (1);
3414}
3415
3416sub update_binding_widgets {
3417 my ($self) = @_;
3418 my ($mod, $sym, $cmds) = $self->get_binding;
3419 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3420 $self->set_command_list ($cmds);
3421}
3422
3423sub get_binding {
3424 my ($self) = @_;
3425 return (
3426 $self->{binding}->[0],
3427 $self->{binding}->[1],
3428 [ grep { defined $_ } @{$self->{commands}} ]
3429 );
3430}
3431
3432sub clear_command_list {
3433 my ($self) = @_;
3434 $self->{cmdbox}->clear ();
3435}
3436
3437sub set_command_list {
3438 my ($self, $cmds) = @_;
3439
3440 $self->{cmdbox}->clear ();
3441 $self->{commands} = $cmds;
3442
3443 my $idx = 0;
3444
3445 for (@$cmds) {
3446 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3447
3448 my $i = $idx;
3449 $hb->add (new CFClient::UI::Label text => $_);
3450 $hb->add (new CFClient::UI::Button
3451 text => "delete",
3452 tooltip => "Deletes the action from the record",
3453 on_activate => sub {
3454 $self->{cmdbox}->remove ($hb);
3455 $cmds->[$i] = undef;
3456 });
3457
3458
3459 $idx++
3460 }
3461}
3462
3463#############################################################################
3464
2860package CFClient::UI; 3465package CFClient::UI;
2861 3466
2862$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3469
28651 34701
2866 3471

Diff Legend

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