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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.262 by elmex, Wed May 31 13:44:26 2006 UTC

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

Diff Legend

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