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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.263 by elmex, Wed May 31 14:04:52 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_markup ($widget->{tooltip}, $widget->{tooltip_font}); 58 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 59 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 } 60 }
41 61
42 return; 62 return;
43 } 63 }
44 } 64 }
… …
48 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
49} 69}
50 70
51# class methods for events 71# class methods for events
52sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 74 if $FOCUS;
55} 75}
56 76
57sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 79 if $FOCUS;
60} 80}
61 81
62sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
63 my ($ev) = @_; 83 my ($ev) = @_;
… …
72 check_tooltip; 92 check_tooltip;
73 } 93 }
74 94
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 96
77 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 99}
82 100
83sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
84 my ($ev) = @_; 102 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
86 104
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 106
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 108
91 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 111
96 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 114 $grab->update if $grab;
99 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 132
117 check_tooltip; 133 check_tooltip;
118 } 134 }
119 135
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 137 if $HOVER;
124} 138}
125 139
126# convert position array to integers 140# convert position array to integers
127sub harmonize { 141sub harmonize {
128 my ($vals) = @_; 142 my ($vals) = @_;
… …
134 $rem += $_ - $i; 148 $rem += $_ - $i;
135 $_ = $i; 149 $_ = $i;
136 } 150 }
137} 151}
138 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
139############################################################################# 194#############################################################################
140 195
141package CFClient::UI::Base; 196package CFClient::UI::Base;
142 197
143use strict; 198use strict;
… …
146 201
147sub new { 202sub new {
148 my $class = shift; 203 my $class = shift;
149 204
150 my $self = bless { 205 my $self = bless {
151 x => 0, 206 x => "center",
152 y => 0, 207 y => "center",
153 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
154 can_events => 1, 211 can_events => 1,
155 @_ 212 @_
156 }, $class; 213 }, $class;
157 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
158 for (keys %$self) { 217 for (keys %$self) {
159 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
161 } 220 }
162 } 221 }
163 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
164 $self 235 $self
165} 236}
166 237
167sub destroy { 238sub destroy {
168 my ($self) = @_; 239 my ($self) = @_;
… …
177 return if $self->{parent}; 248 return if $self->{parent};
178 249
179 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
180} 251}
181 252
182sub hide { 253sub set_visible {
183 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};
184 277
185 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
187 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
188 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
189 if $self->{parent}; 312 if $self->{parent};
190} 313}
191 314
192sub move { 315sub move_abs {
193 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
194 317
195 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
196 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
197 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
198 321
199 $self->update; 322 $self->update;
200} 323}
201 324
202sub set_size { 325sub set_size {
203 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
204 327
205 $self->{user_w} = $w; 328 $self->{force_w} = $w;
206 $self->{user_h} = $h; 329 $self->{force_h} = $h;
207 330
208 $self->check_size; 331 $self->realloc;
209} 332}
210 333
211sub size_request { 334sub size_request {
212 require Carp; 335 require Carp;
213 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
215 338
216sub configure { 339sub configure {
217 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
218 341
219 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
220 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
222 347
223 # use alignment to adjust x, y 348 # use alignment to adjust x, y
224 349
225 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
226 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
227
228 ($w, $h) = ($w2, $h2);
229 } 352 }
230 353
231 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
232 $self->{x} = $x; 355 $self->{x} = $x;
233 $self->{y} = $y; 356 $self->{y} = $y;
234 $self->update; 357 $self->update;
235 } 358 }
236 359
237 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
238 $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;
239 } 367 }
240} 368}
241 369
242sub size_allocate { 370sub size_allocate {
243 # nothing to be done 371 # nothing to be done
244} 372}
245 373
246sub children { 374sub children {
247} 375}
248 376
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
261sub set_max_size { 377sub set_max_size {
262 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
263 379
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 398}
267 399
268# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
269sub coord2local { 401sub coord2local {
270 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 417 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
287 419
288 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
289 421
290 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
291 423
292 $focus->update if $focus; 424 $focus->update if $focus;
293 $FOCUS->update; 425 $FOCUS->update;
294} 426}
295 427
… …
298 430
299 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
300 432
301 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
302 434
303 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
304 436
305 $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;
306} 441}
307 442
308sub mouse_motion { } 443sub mouse_motion { }
309sub button_up { } 444sub button_up { }
310sub key_down { } 445sub key_down { }
311sub key_up { } 446sub key_up { }
312 447
313sub button_down { 448sub button_down {
314 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
315 450
316 $self->focus_in; 451 $self->focus_in;
… …
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
323sub 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}
324 529
325sub draw { 530sub draw {
326 my ($self) = @_; 531 my ($self) = @_;
327 532
328 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
345 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
346 glEnd; 551 glEnd;
347 glDisable GL_BLEND; 552 glDisable GL_BLEND;
348 } 553 }
349 554
350 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
351 glPushMatrix; 556 glPushMatrix;
352 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 560 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
359 glEnd; 564 glEnd;
360 glPopMatrix; 565 glPopMatrix;
361 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;
362 } 567 }
363} 568}
364 569
365sub _draw { 570sub _draw {
366 my ($self) = @_; 571 my ($self) = @_;
367 572
368 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
369} 574}
370 575
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
390}
391
392sub check_size {
393 my ($self) = @_;
394
395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396}
397
398sub update {
399 my ($self) = @_;
400
401 $self->{parent}->update
402 if $self->{parent};
403}
404
405sub connect {
406 my ($self, $signal, $cb) = @_;
407
408 push @{ $self->{signal_cb}{$signal} }, $cb;
409}
410
411sub emit {
412 my ($self, $signal, @args) = @_;
413
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
415}
416
417sub DESTROY { 576sub DESTROY {
418 my ($self) = @_; 577 my ($self) = @_;
419 578
579 delete $WIDGET{$self+0};
420 #$self->deactivate; 580 #$self->deactivate;
421} 581}
422 582
423############################################################################# 583#############################################################################
424 584
… …
433 my $class = shift; 593 my $class = shift;
434 594
435 # range [value, low, high, page] 595 # range [value, low, high, page]
436 596
437 $class->SUPER::new ( 597 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
440 @_ 600 @_
441 ) 601 )
442} 602}
443 603
444sub _draw { 604sub _draw {
445 my ($self) = @_; 605 my ($self) = @_;
446 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
448 613
449 glEnable GL_BLEND; 614 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
452 617
453 glBegin GL_QUADS; 618 glBegin GL_QUADS;
454 glVertex 0 , 0; 619 glVertex 0 , 0;
455 glVertex 0 , $h; 620 glVertex 0 , $h;
456 glVertex $w, $h; 621 glVertex $w, $h;
457 glVertex $w, 0; 622 glVertex $w, 0;
458 glEnd; 623 glEnd;
459 624
460 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
461} 627}
462 628
463############################################################################# 629#############################################################################
464 630
465package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
470 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
472} 638}
473 639
474sub size_request { 640sub size_request {
475 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
476} 644}
477 645
478sub draw { } 646sub draw { }
479 647
480############################################################################# 648#############################################################################
… …
509 $self->{children} = [ 677 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
512 ]; 680 ];
513 681
514 $self->check_size; 682 $self->realloc;
515 $self->update;
516} 683}
517 684
518sub children { 685sub children {
519 @{ $_[0]{children} } 686 @{ $_[0]{children} }
520} 687}
… …
525 delete $child->{parent}; 692 delete $child->{parent};
526 $child->hide; 693 $child->hide;
527 694
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 696
530 $self->check_size; 697 $self->realloc;
531 $self->update;
532} 698}
533 699
534sub clear { 700sub clear {
535 my ($self) = @_; 701 my ($self) = @_;
536 702
… …
540 for (@$children) { 706 for (@$children) {
541 delete $_->{parent}; 707 delete $_->{parent};
542 $_->hide; 708 $_->hide;
543 } 709 }
544 710
545 $self->check_size; 711 $self->realloc;
546 $self->update;
547} 712}
548 713
549sub find_widget { 714sub find_widget {
550 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
551 716
… …
626} 791}
627 792
628sub update { 793sub update {
629 my ($self) = @_; 794 my ($self) = @_;
630 795
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 797 $self->SUPER::update;
633} 798}
634 799
635sub size_allocate { 800sub size_allocate {
636 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
… …
649 $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 {
650 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
652 817
653 $self->_render; 818 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 819 };
662} 820}
663 821
664sub _draw { 822sub _draw {
665 my ($self) = @_; 823 my ($self) = @_;
… …
669 my $tex = $self->{texture} 827 my $tex = $self->{texture}
670 or return; 828 or return;
671 829
672 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
675 833
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 835
678 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
679} 837}
… …
682 840
683package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
684 842
685our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
686 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
687sub size_request { 855sub size_request {
688 my ($self) = @_; 856 my ($self) = @_;
689 857
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 859
693 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
694} 864}
695 865
696sub size_allocate { 866sub size_allocate {
697 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
698 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);
699 $self->update; 875 $self->update;
700} 876}
701 877
702sub set_offset { 878sub set_offset {
703 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
754 my $class = shift; 930 my $class = shift;
755 931
756 my $self; 932 my $self;
757 933
758 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
759 vertical => 1, 935 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub { 937 on_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
763 }, 939 },
764 ; 940 ;
765 941
766 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 944 slider => $slider,
769 @_, 945 @_,
770 ); 946 );
771 947
772 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
775 951
776 $self 952 $self
777} 953}
778 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
779#TODO# update range on size_allocate depeneing on child 974#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 975# update viewport offset on scroll
781 976
782############################################################################# 977#############################################################################
783 978
784package CFClient::UI::Frame; 979package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 983use CFClient::OpenGL;
789 984
790sub new { 985sub new {
791 my $class = shift; 986 my $class = shift;
792 987
793 my $self = $class->SUPER::new ( 988 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 989 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 990 @_,
798 ); 991 )
799
800 $self
801} 992}
802 993
803sub _draw { 994sub _draw {
804 my ($self) = @_; 995 my ($self) = @_;
805 996
806 my ($w, $h) = ($self->{w}, $self->{h}); 997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
807 999
808 glEnable GL_BLEND; 1000 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 1002 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 1003
813# glBegin GL_QUADS; 1004 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 1005 glVertex 0 , 0;
816# glVertex 0 , $h; 1006 glVertex 0 , $h;
817# glVertex $w, $h; 1007 glVertex $w, $h;
818# glVertex $w, 0; 1008 glVertex $w, 0;
819# glEnd; 1009 glEnd;
820 1010
821
822 $self->child->draw;
823 glDisable GL_BLEND; 1011 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 1012 }
1013
1014 $self->SUPER::_draw;
825} 1015}
826 1016
827############################################################################# 1017#############################################################################
828 1018
829package CFClient::UI::FancyFrame; 1019package CFClient::UI::FancyFrame;
830 1020
831our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
832 1022
833use CFClient::OpenGL; 1023use CFClient::OpenGL;
834 1024
835my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838 1032
839sub new { 1033sub new {
840 my $class = shift; 1034 my $class = shift;
841 1035
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
847 border => 0.6, 1039 border => 0.6,
848 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
849 @_ 1043 @_
850 ); 1044 );
851 1045
852 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
853 align => 0, 1047 align => 0,
… …
877 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
878 1072
879 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
881 1075
882 $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)
883 if $self->{title}; 1077 if $self->{title};
884 1078
885 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
886} 1080}
887 1081
… …
906 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
907 1101
908 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
910 1104
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
914 $self->check_size;
915 }; 1110 };
916 1111
917 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
919 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
921 $self->{motion} = sub { 1116 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
923 1118
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
925 1120
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
927 $self->update;
928 }; 1122 };
929 } 1123 }
930} 1124}
931 1125
932sub button_up { 1126sub button_up {
… …
945 my ($self) = @_; 1139 my ($self) = @_;
946 1140
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1143
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1146
955 my $border = $self->border; 1147 my $border = $self->border;
956 1148
957 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1154
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
965 1157
966 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
967 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
968 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
969
970 glColor @{ $self->{bg} };
971
972 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
976 1164
977 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1166
981 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
982 1168
983 $self->child->draw; 1169 $self->child->draw;
984} 1170}
… …
996sub new { 1182sub new {
997 my $class = shift; 1183 my $class = shift;
998 1184
999 $class->SUPER::new ( 1185 $class->SUPER::new (
1000 col_expand => [], 1186 col_expand => [],
1001 @_ 1187 @_,
1002 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1193}
1004 1194
1005sub add { 1195sub add {
1006 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1007 1197
1008 $child->set_parent ($self); 1198 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1010 1200
1011 $child->check_size; 1201 $self->realloc;
1012} 1202}
1013 1203
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
1018# 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?
1019sub clear { 1205sub clear {
1020 my ($self) = @_; 1206 my ($self) = @_;
1021 1207
1022 my @children = $self->children; 1208 my @children = $self->children;
1023 delete $self->{children}; 1209 delete $self->{children};
… …
1025 for (@children) { 1211 for (@children) {
1026 delete $_->{parent}; 1212 delete $_->{parent};
1027 $_->hide; 1213 $_->hide;
1028 } 1214 }
1029 1215
1030 $self->update; 1216 $self->realloc;
1031} 1217}
1032 1218
1033sub get_wh { 1219sub get_wh {
1034 my ($self) = @_; 1220 my ($self) = @_;
1035 1221
… …
1066sub size_allocate { 1252sub size_allocate {
1067 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1068 1254
1069 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1070 1256
1071 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1073 1259
1074 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1317 }
1132} 1318}
1133 1319
1134############################################################################# 1320#############################################################################
1135 1321
1136package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1137
1138# TODO: wrap into common Box base class
1139 1323
1140our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1141 1325
1142sub size_request { 1326sub size_request {
1143 my ($self) = @_; 1327 my ($self) = @_;
1144 1328
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1146 1330 ? (
1147 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1148 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1149 (List::Util::max map $_->[1], @alloc), 1333 )
1150 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1151} 1338}
1152 1339
1153sub size_allocate { 1340sub size_allocate {
1154 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1155 1342
1156 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1157
1158 my $children = $self->{children}; 1344 my $children = $self->{children};
1159 1345
1160 my @h = map $_->{req_w}, @$children; 1346 my @req;
1161 1347
1162 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1163 1349 @req = ($space / (@$children || 1)) x @$children;
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } 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 {
1168 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1169 $exp ||= 1;
1170 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1171 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 } 1364 }
1178 } 1365 }
1179 1366
1180 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1181 1368
1182 my $y = 0; 1369 my $pos = 0;
1183 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1186 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1187 1373
1188 $y += $h; 1374 $pos += $alloc;
1189 } 1375 }
1190 1376
1191 1 1377 1
1192} 1378}
1193 1379
1194############################################################################# 1380#############################################################################
1195 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
1196package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1197 1398
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1201 1400
1202sub size_request { 1401sub new {
1203 my ($self) = @_; 1402 my $class = shift;
1204 1403
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1206 1405 vertical => 1,
1207 ( 1406 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1407 )
1211} 1408}
1212 1409
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1410#############################################################################
1253 1411
1254package CFClient::UI::Label; 1412package CFClient::UI::Label;
1255 1413
1256our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1257 1415
1258use CFClient::OpenGL; 1416use CFClient::OpenGL;
1259 1417
1260sub new { 1418sub new {
1261 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1262 1420
1263 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1265 #font => default_font 1425 #font => default_font
1266 #text => initial text 1426 #text => initial text
1267 #markup => initial narkup 1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1269 fontsize => 1, 1431 fontsize => 1,
1270 align => -1, 1432 align => -1,
1271 valign => -1, 1433 valign => -1,
1272 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1273 can_events => 0, 1436 can_events => 0,
1274 %arg 1437 %arg
1275 ); 1438 );
1276 1439
1277 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1287 } 1450 }
1288 1451
1289 $self 1452 $self
1290} 1453}
1291 1454
1292sub escape { 1455sub escape($) {
1293 local $_ = $_[1]; 1456 local $_ = $_[0];
1294 1457
1295 s/&/&amp;/g; 1458 s/&/&amp;/g;
1296 s/>/&gt;/g; 1459 s/>/&gt;/g;
1297 s/</&lt;/g; 1460 s/</&lt;/g;
1298 1461
1299 $_[1] 1462 $_
1300} 1463}
1301 1464
1302sub update { 1465sub update {
1303 my ($self) = @_; 1466 my ($self) = @_;
1304 1467
… …
1313 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1314 1477
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1317 1480
1481 $self->realloc;
1318 $self->update; 1482 $self->update;
1319 $self->check_size;
1320} 1483}
1321 1484
1322sub set_markup { 1485sub set_markup {
1323 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1324 1487
… …
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1492
1330 $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;
1331 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1332 1495
1496 $self->realloc;
1333 $self->update; 1497 $self->update;
1334 $self->check_size;
1335} 1498}
1336 1499
1337sub size_request { 1500sub size_request {
1338 my ($self) = @_; 1501 my ($self) = @_;
1339 1502
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $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});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1508
1344 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1345 1510
1346 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1351 1516
1352 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1354 } 1519 }
1355 1520
1356 ( 1521 ($w, $h)
1357 $w + $self->{padding} * 2,
1358 $h + $self->{padding} * 2,
1359 )
1360} 1522}
1361 1523
1362sub size_allocate { 1524sub size_allocate {
1363 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1364 1526
… …
1369 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1370 1532
1371 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1372 delete $self->{texture}; 1534 delete $self->{texture};
1373 1535
1374 $self->update; 1536 $self->realloc;
1375 $self->check_size;
1376} 1537}
1377 1538
1378sub _draw { 1539sub _draw {
1379 my ($self) = @_; 1540 my ($self) = @_;
1541
1542 $self->SUPER::_draw; # draw background, if applicable
1380 1543
1381 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1545 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1551
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1553
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1556 : ($self->{w} - $tex->{w}) * 0.5);
1392 1557
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1560 : ($self->{h} - $tex->{h}) * 0.5);
1396 1561
1397 $tex 1562 $tex
1398 }; 1563 };
1399 1564
1400 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1429 can_hover => 1, 1594 can_hover => 1,
1430 can_focus => 1, 1595 can_focus => 1,
1431 valign => 0, 1596 valign => 0,
1432 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1433 @_ 1599 @_
1434 ) 1600 )
1435} 1601}
1436 1602
1437sub _set_text { 1603sub _set_text {
… …
1447 $self->{text} = $text; 1613 $self->{text} = $text;
1448 1614
1449 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1451 1617
1452 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1453} 1619}
1454 1620
1455sub set_text { 1621sub set_text {
1456 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1457 1623
1458 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1625 $self->_set_text ($text);
1460 $self->check_size; 1626
1461 $self->update; 1627 $self->realloc;
1462} 1628}
1463 1629
1464sub get_text { 1630sub get_text {
1465 $_[0]{text} 1631 $_[0]{text}
1466} 1632}
… …
1469 my ($self) = @_; 1635 my ($self) = @_;
1470 1636
1471 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1472 1638
1473 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1474}
1475
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480} 1640}
1481 1641
1482sub key_down { 1642sub key_down {
1483 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1484 1644
… …
1486 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1488 1648
1489 my $text = $self->get_text; 1649 my $text = $self->get_text;
1490 1650
1491 if ($sym == 8) { 1651 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1664 $self->_emit ('escape');
1505 } elsif ($uni) { 1665 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1667 }
1508 1668
1509 $self->_set_text ($text); 1669 $self->_set_text ($text);
1510 $self->update; 1670
1671 $self->realloc;
1511} 1672}
1512 1673
1513sub focus_in { 1674sub focus_in {
1514 my ($self) = @_; 1675 my ($self) = @_;
1515 1676
… …
1595 if ($sym == 13) { 1756 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1601 $self->update; 1762 $self->update;
1602 1763
1603 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1642 1803
1643sub new { 1804sub new {
1644 my $class = shift; 1805 my $class = shift;
1645 1806
1646 $class->SUPER::new ( 1807 $class->SUPER::new (
1647 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1648 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1651 can_hover => 1, 1812 can_hover => 1,
1652 align => 0, 1813 align => 0,
1653 valign => 0, 1814 valign => 0,
1654 can_events => 1, 1815 can_events => 1,
1655 @_ 1816 @_
1656 ) 1817 )
1657} 1818}
1658 1819
1820sub activate { }
1821
1659sub button_up { 1822sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1661 1824
1825 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate");
1665 }
1666} 1828}
1667 1829
1668sub _draw { 1830sub _draw {
1669 my ($self) = @_; 1831 my ($self) = @_;
1670 1832
… …
1699 1861
1700sub new { 1862sub new {
1701 my $class = shift; 1863 my $class = shift;
1702 1864
1703 $class->SUPER::new ( 1865 $class->SUPER::new (
1704 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1705 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1872 state => 0,
1708 can_hover => 1, 1873 can_hover => 1,
1709 @_ 1874 @_
1710 ) 1875 )
1711} 1876}
1712 1877
1713sub size_request { 1878sub size_request {
1714 my ($self) = @_; 1879 my ($self) = @_;
1715 1880
1716 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1717} 1882}
1718 1883
1719sub button_down { 1884sub button_down {
1720 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1721 1886
1722 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1723 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1724 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1725 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1726 } 1891 }
1727} 1892}
1728 1893
1729sub _draw { 1894sub _draw {
1730 my ($self) = @_; 1895 my ($self) = @_;
1731 1896
1732 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1733 1898
1734 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1735 1900
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1737 1904
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1906
1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1740 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1747} 1912}
1748 1913
1749############################################################################# 1914#############################################################################
1750 1915
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1998 2163
1999sub new { 2164sub new {
2000 my $class = shift; 2165 my $class = shift;
2001 2166
2002 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
2003 2168
2004 # TODO: 0-width page 2169 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2171 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2013 vertical => 0, 2180 vertical => 0,
2014 can_hover => 1, 2181 can_hover => 1,
2015 inner_pad => 5, 2182 inner_pad => 0.02,
2016 @_ 2183 @_
2017 ); 2184 );
2018 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
2019 $self 2189 $self
2020} 2190}
2021 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
2022sub size_request { 2226sub size_request {
2023 my ($self) = @_; 2227 my ($self) = @_;
2024 2228
2025 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2026 my $h = $self->{req_h};
2027
2028 $self->{vertical} ? ($h, $w) : ($w, $h)
2029} 2230}
2030 2231
2031sub button_down { 2232sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2033 2234
2034 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
2035 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2036} 2240}
2037 2241
2038sub mouse_motion { 2242sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
2040 2244
2041 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2043 2264
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2266
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2269
2049 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2272
2055 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2274 $self->{knob_w} = $knob_w;
2057 } 2275 });
2058}
2059 2276
2060# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2278}
2067 2279
2068sub _draw { 2280sub _draw {
2069 my ($self) = @_; 2281 my ($self) = @_;
2070 2282
2071 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
2072 2284
2073 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
2074 2286
2075 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2077 2289
2290 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2292 }
2083 2293
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2296
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2299
2108 # draw background 2300 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2302
2111 # draw handle 2303 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2305
2114 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2115} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
2116 2349
2117############################################################################# 2350#############################################################################
2118 2351
2119package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2120 2353
… …
2150 2383
2151 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2385 $self->reflow;
2153} 2386}
2154 2387
2155sub text_height {
2156 my ($self, $text) = @_;
2157
2158 my $layout = $self->{layout};
2159
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w});
2162 $layout->set_markup ($text);
2163
2164 ($layout->size)[1]
2165}
2166
2167sub reflow {
2168 my ($self) = @_;
2169
2170 $self->{need_reflow}++;
2171 $self->update;
2172}
2173
2174sub size_allocate { 2388sub size_allocate {
2175 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2176 2390
2177 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2178 2392
… …
2181 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2182 2396
2183 $self->reflow; 2397 $self->reflow;
2184} 2398}
2185 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2186sub add_paragraph { 2434sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2188 2436
2189 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2190 2438 my ($w, $h) = $self->text_size ($line);
2191 my $height = $self->text_height ($text);
2192
2193 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2194 2442
2195 push @{$self->{par}}, [$height, $color, $text];
2196
2197 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2198 $self->{children}[1]->update;
2199} 2444}
2200 2445
2201sub update { 2446sub update {
2202 my ($self) = @_; 2447 my ($self) = @_;
2203 2448
… …
2205 2450
2206 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2207 2452
2208 delete $self->{texture}; 2453 delete $self->{texture};
2209 2454
2210 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2211 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2459 my $height = 0;
2213 2460
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2215 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2216 2476
2217 $self->{height} = $height; 2477 $self->{height} = $height;
2218 2478
2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2220 2480
2221 delete $self->{texture}; 2481 delete $self->{texture};
2222 } 2482 }
2223 2483
2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2225 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2227 2487
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2232 2489
2233 my $y0 = $top; 2490 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2235 2492
2236 my $y = 0; 2493 my $y = 0;
2237 2494
2238 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2239 2496
2240 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2241 2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2242 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2243 my $h = $par->[0]; 2504 my $h = $par->[1];
2244 2505
2245 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2247 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2248 2510
2249 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2512
2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251 } 2515 }
2252 2516
2253 $y += $h; 2517 $y += $h;
2254 } 2518 }
2255 2519
2256 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2257 }; 2521 };
2258 }); 2522 });
2259} 2523}
2260 2524
2261sub _draw { 2525sub _draw {
2262 my ($self) = @_; 2526 my ($self) = @_;
2263 2527
2264 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2269 2533
2270 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2271 2535
2272} 2536}
… …
2321 2585
2322sub new { 2586sub new {
2323 my $class = shift; 2587 my $class = shift;
2324 2588
2325 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2326 state => 0, 2590 state => 0,
2327 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2328 @_ 2592 @_
2329 ); 2593 );
2330 2594
2331 if ($self->{state}) {
2332 $self->{state} = 0;
2333 $self->toggle_flopper;
2334 }
2335
2336 $self 2595 $self
2337} 2596}
2338 2597
2339sub toggle_flopper { 2598sub toggle_flopper {
2340 my ($self) = @_; 2599 my ($self) = @_;
2341 2600
2342 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2343 if ($self->{state} = !$self->{state}) {
2344 $CFClient::UI::ROOT->add ($self->{other});
2345 $self->{other}->move ($self->coord2global (0, $self->{h}));
2346 $self->emit ("open");
2347 } else {
2348 $CFClient::UI::ROOT->remove ($self->{other});
2349 $self->emit ("close");
2350 }
2351
2352 $self->emit (changed => $self->{state});
2353} 2602}
2354 2603
2355############################################################################# 2604#############################################################################
2356 2605
2357package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2367 @_, 2616 @_,
2368 can_events => 0, 2617 can_events => 0,
2369 ) 2618 )
2370} 2619}
2371 2620
2372sub set_markup { 2621sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2622 my ($self, $widget) = @_;
2374 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2375 $self->{label} = new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2636 fontsize => 0.8,
2377 fg => [0, 0, 0], 2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2640 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2641}
2384 2642
2385sub size_request { 2643sub size_request {
2386 my ($self) = @_; 2644 my ($self) = @_;
2387 2645
… …
2394 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2395 2653
2396 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2397} 2655}
2398 2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2399sub _draw { 2675sub _draw {
2400 my ($self) = @_; 2676 my ($self) = @_;
2401 2677
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2404 2679
2405 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2406 2681
2407 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2693 glVertex 0 , $h;
2419 glVertex $w, $h; 2694 glVertex $w, $h;
2420 glVertex $w, 0; 2695 glVertex $w, 0;
2421 glEnd; 2696 glEnd;
2422 2697
2423 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2424 2699
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2427} 2701}
2428 2702
2429############################################################################# 2703#############################################################################
2430 2704
… …
2435use CFClient::OpenGL; 2709use CFClient::OpenGL;
2436 2710
2437sub new { 2711sub new {
2438 my $class = shift; 2712 my $class = shift;
2439 2713
2440 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2441 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2442 @_, 2717 @_,
2443 ) 2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2444} 2735}
2445 2736
2446sub size_request { 2737sub size_request {
2447 (32, 8) 2738 (32, 8)
2448} 2739}
2449 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2450sub _draw { 2749sub _draw {
2451 my ($self) = @_; 2750 my ($self) = @_;
2452 2751
2453 return unless $::CONN;#d# manage and cache textures differently 2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 2764
2456 # TODO animation
2457 if ($tex) { 2765 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2463 } 2771 }
2464} 2772}
2465 2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2466############################################################################# 2783#############################################################################
2467 2784
2468package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2469 2786
2470our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2471 2788
2472sub new { 2789sub new {
2473 my $class = shift; 2790 my $class = shift;
2474 2791
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2485 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_, 2794 @_,
2544 ); 2795 );
2545 2796
2546 $self 2797 $self
2547} 2798}
… …
2550 my ($self, $items) = @_; 2801 my ($self, $items) = @_;
2551 2802
2552 $self->{scrolled}->clear; 2803 $self->{scrolled}->clear;
2553 return unless $items; 2804 return unless $items;
2554 2805
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2556 2810
2557 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2558 2812
2813 my $row = 0;
2559 for my $item (@items) { 2814 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2 2815 CFClient::Item::update_widgets $item;
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563 2816
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2565 } 2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2566 2820
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2568} 2822 }
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573} 2823}
2574 2824
2575############################################################################# 2825#############################################################################
2576 2826
2577package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2612 2862
2613# popup given the event (must be a mouse button down event currently) 2863# popup given the event (must be a mouse button down event currently)
2614sub popup { 2864sub popup {
2615 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2616 2866
2617 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2618 2868
2619 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self; 2870 $GRAB = $self;
2621 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2622 2872
2623 $self->show; 2873 $self->show;
2624 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2625} 2875}
2626 2876
2627sub mouse_motion { 2877sub mouse_motion {
2628 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2629 2879
… …
2637 2887
2638 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB; 2889 undef $GRAB;
2640 $self->hide; 2890 $self->hide;
2641 2891
2642 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2644 } 2894 }
2645} 2895}
2646 2896
2647############################################################################# 2897#############################################################################
2648 2898
2649package CFClient::UI::Statusbox; 2899package CFClient::UI::Statusbox;
2650 2900
2651our @ISA = CFClient::UI::VBox::; 2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2652 2911
2653sub reorder { 2912sub reorder {
2654 my ($self) = @_; 2913 my ($self) = @_;
2655 my $NOW = time; 2914 my $NOW = time;
2656 2915
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2916 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2918 }
2660 2919
2661 my @widgets; 2920 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2663 my $count = 10 + 1; 2927 my $count = 10 + 1;
2664 for my $item (@items) { 2928 for my $item (@items) {
2665 last unless --$count; 2929 last unless --$count;
2666 2930
2667 push @widgets, $item->{label} ||= do { 2931 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2932 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2670 for ($short) { 2937 for ($short) {
2671 s/^\s+//; 2938 s/^\s+//;
2672 s/\012.*//s; 2939 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 2940 }
2676 2941
2677 new CFClient::UI::Label 2942 new CFClient::UI::Label
2678 markup => $short, 2943 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2944 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 2945 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2682 can_events => 1, 2950 can_events => 1,
2683 can_hover => 1, 2951 can_hover => 1
2684 }; 2952 };
2685 } 2953 }
2686 2954
2687 $self->clear; 2955 $self->clear;
2688 $self->SUPER::add (@widgets); 2956 $self->SUPER::add (reverse @widgets);
2689} 2957}
2690 2958
2691sub add { 2959sub add {
2692 my ($self, $text, %arg) = @_; 2960 my ($self, $text, %arg) = @_;
2693 2961
2694 my $item = { 2962 $text =~ s/^\s+//;
2695 time => time, 2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2696 text => $text, 2984 text => $text,
2697 timeout => 60, 2985 timeout => $timeout,
2698 tooltip => $text, 2986 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2701 %arg, 2990 %arg,
2991 };
2702 }; 2992 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 2993
2709 $self->reorder; 2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
2710} 3005}
2711 3006
2712############################################################################# 3007#############################################################################
2713 3008
2714package CFClient::UI::Root; 3009package CFClient::UI::Root;
… …
2718use CFClient::OpenGL; 3013use CFClient::OpenGL;
2719 3014
2720sub new { 3015sub new {
2721 my $class = shift; 3016 my $class = shift;
2722 3017
2723 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3019 visible => 1,
2724 @_, 3020 @_,
2725 ) 3021 );
2726}
2727 3022
2728sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2729 my ($self, $x, $y, $w, $h) = @_;
2730 3024
2731 $self->{w} = $w; 3025 $self
2732 $self->{h} = $h;
2733}
2734
2735sub check_size {
2736 my ($self) = @_;
2737
2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2740} 3026}
2741 3027
2742sub size_request { 3028sub size_request {
2743 my ($self) = @_; 3029 my ($self) = @_;
2744 3030
2745 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2746} 3046}
2747 3047
2748sub size_allocate { 3048sub size_allocate {
2749 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2750 3050
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2767 for my $child ($self->children) { 3051 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 3053
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
2772 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2773 } 3061 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 3062}
2778 3063
2779sub coord2local { 3064sub coord2local {
2780 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2781 3066
… …
2789} 3074}
2790 3075
2791sub update { 3076sub update {
2792 my ($self) = @_; 3077 my ($self) = @_;
2793 3078
2794 $self->check_size;
2795 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
2796} 3080}
2797 3081
2798sub add { 3082sub add {
2799 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2800 3084
2801 # integerise window positions 3085 $_->{is_toplevel} = 1
2802 $child->{x} = int $child->{x}; 3086 for @children;
2803 $child->{y} = int $child->{y};
2804 3087
2805 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2806} 3104}
2807 3105
2808sub on_refresh { 3106sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2810 3108
2811 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2812} 3110}
2813 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2814sub draw { 3118sub draw {
2815 my ($self) = @_; 3119 my ($self) = @_;
2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860 3120
2861 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2862 $_->() 3122 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
2864 } 3124 }
2865 3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
3199
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2869 3203
2870 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 3205 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 3208 glLoadIdentity;
2875 3209
2876 $self->_draw; 3210 $self->_draw;
2877} 3211}
2878 3212
2879############################################################################# 3213#############################################################################
2880 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440
3441 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3443 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3444 expand => 1);
3445
3446 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3447 text => "bind to key",
3448 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3449}
3450
3451sub rebuild_spell_list {
3452 my ($self) = @_;
3453 $self->{tbl_idx} = 0;
3454 $self->add_spell ($_) for values %{$self->{spells}};
3455}
3456
3457sub remove_spell {
3458 my ($self, $spell) = @_;
3459 delete $self->{spells}->{$spell->{name}};
3460 $self->rebuild_spell_list;
3461}
3462
3463#############################################################################
3464
2881package CFClient::UI; 3465package CFClient::UI;
2882 3466
2883$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3469
28861 34701
2887 3471

Diff Legend

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