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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 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}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
50 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
51} 69}
52 70
53# class methods for events 71# class methods for events
54sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 74 if $FOCUS;
57} 75}
58 76
59sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 79 if $FOCUS;
62} 80}
63 81
64sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
… …
74 check_tooltip; 92 check_tooltip;
75 } 93 }
76 94
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 96
79 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 99}
84 100
85sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
86 my ($ev) = @_; 102 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
88 104
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 106
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 108
93 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 111
98 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 114 $grab->update if $grab;
101 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 132
119 check_tooltip; 133 check_tooltip;
120 } 134 }
121 135
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 137 if $HOVER;
126} 138}
127 139
128# convert position array to integers 140# convert position array to integers
129sub harmonize { 141sub harmonize {
130 my ($vals) = @_; 142 my ($vals) = @_;
… …
144 156
145 $_->update 157 $_->update
146 for @widgets; 158 for @widgets;
147} 159}
148 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
149# call when resolution changes etc. 169# call when resolution changes etc.
150sub rescale_widgets { 170sub rescale_widgets {
151 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
152 172
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 173 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 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
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
166 } 188 }
167
168 $widget->reconfigure;
169 } 189 }
190
191 reconfigure_widgets;
170} 192}
171 193
172############################################################################# 194#############################################################################
173 195
174package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
179 201
180sub new { 202sub new {
181 my $class = shift; 203 my $class = shift;
182 204
183 my $self = bless { 205 my $self = bless {
184 x => 0, 206 x => "center",
185 y => 0, 207 y => "center",
186 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
187 can_events => 1, 211 can_events => 1,
188 @_ 212 @_
189 }, $class; 213 }, $class;
190 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
191 for (keys %$self) { 217 for (keys %$self) {
192 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
194 } 220 }
195 } 221 }
196 222
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 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 }
198 234
199 $self 235 $self
200} 236}
201 237
202sub destroy { 238sub destroy {
… …
212 return if $self->{parent}; 248 return if $self->{parent};
213 249
214 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
215} 251}
216 252
217sub hide { 253sub set_visible {
218 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};
219 277
220 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
222 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
223 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
224 if $self->{parent}; 312 if $self->{parent};
225} 313}
226 314
227sub move { 315sub move_abs {
228 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
229 317
230 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
231 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
232 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
233 321
234 $self->update; 322 $self->update;
235} 323}
236 324
237sub set_size { 325sub set_size {
238 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
239 327
240 $self->{user_w} = $w; 328 $self->{force_w} = $w;
241 $self->{user_h} = $h; 329 $self->{force_h} = $h;
242 330
243 $self->check_size; 331 $self->realloc;
244} 332}
245 333
246sub size_request { 334sub size_request {
247 require Carp; 335 require Carp;
248 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
250 338
251sub configure { 339sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
253 341
254 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
257 347
258 # use alignment to adjust x, y 348 # use alignment to adjust x, y
259 349
260 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 352 }
265 353
266 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 355 $self->{x} = $x;
268 $self->{y} = $y; 356 $self->{y} = $y;
269 $self->update; 357 $self->update;
270 } 358 }
271 359
272 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $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;
274 } 367 }
275} 368}
276 369
277sub size_allocate { 370sub size_allocate {
278 # nothing to be done 371 # nothing to be done
279} 372}
280 373
281sub reconfigure {
282 my ($self) = @_;
283
284 $self->check_size (1);
285 $self->update;
286}
287
288sub children { 374sub children {
289} 375}
290 376
291sub set_max_size { 377sub set_max_size {
292 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
… …
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
296} 382}
297 383
298sub set_tooltip { 384sub set_tooltip {
299 my ($self, $tooltip) = @_; 385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
300 391
301 $self->{tooltip} = $tooltip; 392 $self->{tooltip} = $tooltip;
302 393
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 395 delete $CFClient::UI::TOOLTIP->{owner};
… …
326 return if $FOCUS == $self; 417 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
328 419
329 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
330 421
331 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
332 423
333 $focus->update if $focus; 424 $focus->update if $focus;
334 $FOCUS->update; 425 $FOCUS->update;
335} 426}
336 427
… …
339 430
340 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
341 432
342 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
343 434
344 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
345 436
346 $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;
347} 441}
348 442
349sub mouse_motion { } 443sub mouse_motion { }
350sub button_up { } 444sub button_up { }
351sub key_down { } 445sub key_down { }
352sub key_up { } 446sub key_up { }
353 447
354sub button_down { 448sub button_down {
355 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
356 450
357 $self->focus_in; 451 $self->focus_in;
… …
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
364sub 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}
365 529
366sub draw { 530sub draw {
367 my ($self) = @_; 531 my ($self) = @_;
368 532
369 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
386 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
387 glEnd; 551 glEnd;
388 glDisable GL_BLEND; 552 glDisable GL_BLEND;
389 } 553 }
390 554
391 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
392 glPushMatrix; 556 glPushMatrix;
393 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 560 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
398 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
399 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
400 glEnd; 564 glEnd;
401 glPopMatrix; 565 glPopMatrix;
402 #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;
403 } 567 }
404} 568}
405 569
406sub _draw { 570sub _draw {
407 my ($self) = @_; 571 my ($self) = @_;
408 572
409 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
410}
411
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458} 574}
459 575
460sub DESTROY { 576sub DESTROY {
461 my ($self) = @_; 577 my ($self) = @_;
462 578
… …
520 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
522} 638}
523 639
524sub size_request { 640sub size_request {
525 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
526} 644}
527 645
528sub draw { } 646sub draw { }
529 647
530############################################################################# 648#############################################################################
… …
559 $self->{children} = [ 677 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
562 ]; 680 ];
563 681
564 $self->check_size (1); 682 $self->realloc;
565 $self->update;
566} 683}
567 684
568sub children { 685sub children {
569 @{ $_[0]{children} } 686 @{ $_[0]{children} }
570} 687}
… …
575 delete $child->{parent}; 692 delete $child->{parent};
576 $child->hide; 693 $child->hide;
577 694
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 696
580 $self->check_size; 697 $self->realloc;
581 $self->update;
582} 698}
583 699
584sub clear { 700sub clear {
585 my ($self) = @_; 701 my ($self) = @_;
586 702
… …
590 for (@$children) { 706 for (@$children) {
591 delete $_->{parent}; 707 delete $_->{parent};
592 $_->hide; 708 $_->hide;
593 } 709 }
594 710
595 $self->check_size; 711 $self->realloc;
596 $self->update;
597} 712}
598 713
599sub find_widget { 714sub find_widget {
600 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
601 716
… …
725 840
726package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
727 842
728our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
729 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
730sub size_request { 855sub size_request {
731 my ($self) = @_; 856 my ($self) = @_;
732 857
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 859
736 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
737} 864}
738 865
739sub size_allocate { 866sub size_allocate {
740 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
741 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);
742 $self->update; 875 $self->update;
743} 876}
744 877
745sub set_offset { 878sub set_offset {
746 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
797 my $class = shift; 930 my $class = shift;
798 931
799 my $self; 932 my $self;
800 933
801 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
802 vertical => 1, 935 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 937 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
806 }, 939 },
807 ; 940 ;
808 941
809 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 943 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
818 951
819 $self 952 $self
953}
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]);
820} 972}
821 973
822#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 975# update viewport offset on scroll
824 976
… …
868 1020
869our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
870 1022
871use CFClient::OpenGL; 1023use CFClient::OpenGL;
872 1024
873my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 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);
876 1032
877sub new { 1033sub new {
878 my $class = shift; 1034 my $class = shift;
879 1035
880 # TODO: user_x, user_y, overwrite moveto?
881
882 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1039 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
888 @_ 1043 @_
889 ); 1044 );
890 1045
891 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
892 align => 0, 1047 align => 0,
… …
945 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
946 1101
947 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
949 1104
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size;
954 }; 1110 };
955 1111
956 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1116 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
962 1118
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
964 1120
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update;
967 }; 1122 };
968 } 1123 }
969} 1124}
970 1125
971sub button_up { 1126sub button_up {
… …
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1146
992 my $border = $self->border; 1147 my $border = $self->border;
993 1148
994 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1154
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1002 1157
1003 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1163 }
1014 1164
1015 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1016 1166
… …
1032sub new { 1182sub new {
1033 my $class = shift; 1183 my $class = shift;
1034 1184
1035 $class->SUPER::new ( 1185 $class->SUPER::new (
1036 col_expand => [], 1186 col_expand => [],
1037 @_ 1187 @_,
1038 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1193}
1040 1194
1041sub add { 1195sub add {
1042 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1043 1197
1044 $child->set_parent ($self); 1198 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1046 1200
1047 $child->check_size; 1201 $self->realloc;
1048} 1202}
1049 1203
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# 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?
1055sub clear { 1205sub clear {
1056 my ($self) = @_; 1206 my ($self) = @_;
1057 1207
1058 my @children = $self->children; 1208 my @children = $self->children;
1059 delete $self->{children}; 1209 delete $self->{children};
… …
1061 for (@children) { 1211 for (@children) {
1062 delete $_->{parent}; 1212 delete $_->{parent};
1063 $_->hide; 1213 $_->hide;
1064 } 1214 }
1065 1215
1066 $self->update; 1216 $self->realloc;
1067} 1217}
1068 1218
1069sub get_wh { 1219sub get_wh {
1070 my ($self) = @_; 1220 my ($self) = @_;
1071 1221
… …
1102sub size_allocate { 1252sub size_allocate {
1103 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1104 1254
1105 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1106 1256
1107 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1109 1259
1110 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1167 } 1317 }
1168} 1318}
1169 1319
1170############################################################################# 1320#############################################################################
1171 1321
1172package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1173
1174# TODO: wrap into common Box base class
1175 1323
1176our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1177 1325
1178sub size_request { 1326sub size_request {
1179 my ($self) = @_; 1327 my ($self) = @_;
1180 1328
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1182 1330 ? (
1183 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1184 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1185 (List::Util::max map $_->[1], @alloc), 1333 )
1186 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1187} 1338}
1188 1339
1189sub size_allocate { 1340sub size_allocate {
1190 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1191 1342
1192 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1193
1194 my $children = $self->{children}; 1344 my $children = $self->{children};
1195 1345
1196 my @h = map $_->{req_w}, @$children; 1346 my @req;
1197 1347
1198 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1199 1349 @req = ($space / (@$children || 1)) x @$children;
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } 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 {
1204 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1205 $exp ||= 1;
1206 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1207 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 } 1364 }
1214 } 1365 }
1215 1366
1216 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1217 1368
1218 my $y = 0; 1369 my $pos = 0;
1219 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1222 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1223 1373
1224 $y += $h; 1374 $pos += $alloc;
1225 } 1375 }
1226 1376
1227 1 1377 1
1228} 1378}
1229 1379
1230############################################################################# 1380#############################################################################
1231 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
1232package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1233 1398
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1237 1400
1238sub size_request { 1401sub new {
1239 my ($self) = @_; 1402 my $class = shift;
1240 1403
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1242 1405 vertical => 1,
1243 ( 1406 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1407 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1408}
1287 1409
1288############################################################################# 1410#############################################################################
1289 1411
1290package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1429 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1309 fontsize => 1, 1431 fontsize => 1,
1310 align => -1, 1432 align => -1,
1311 valign => -1, 1433 valign => -1,
1312 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1313 can_events => 0, 1436 can_events => 0,
1314 %arg 1437 %arg
1315 ); 1438 );
1316 1439
1317 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1353 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1354 1477
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1357 1480
1481 $self->realloc;
1358 $self->update; 1482 $self->update;
1359 $self->check_size;
1360} 1483}
1361 1484
1362sub set_markup { 1485sub set_markup {
1363 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1364 1487
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1492
1370 $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;
1371 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1372 1495
1496 $self->realloc;
1373 $self->update; 1497 $self->update;
1374 $self->check_size;
1375} 1498}
1376 1499
1377sub size_request { 1500sub size_request {
1378 my ($self) = @_; 1501 my ($self) = @_;
1379 1502
… …
1393 1516
1394 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1396 } 1519 }
1397 1520
1398 ( 1521 ($w, $h)
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1522}
1403 1523
1404sub size_allocate { 1524sub size_allocate {
1405 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1406 1526
1407 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1408} 1529}
1409 1530
1410sub set_fontsize { 1531sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1412 1533
1413 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1535 delete $self->{texture};
1415 1536
1416 $self->update; 1537 $self->realloc;
1417 $self->check_size;
1418} 1538}
1419 1539
1420sub _draw { 1540sub _draw {
1421 my ($self) = @_; 1541 my ($self) = @_;
1422 1542
… …
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1552
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1434 1554
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1438 1558
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1442 1562
1443 $tex 1563 $tex
1444 }; 1564 };
1445 1565
… …
1474 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1475 can_hover => 1, 1595 can_hover => 1,
1476 can_focus => 1, 1596 can_focus => 1,
1477 valign => 0, 1597 valign => 0,
1478 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1479 @_ 1600 @_
1480 ) 1601 )
1481} 1602}
1482 1603
1483sub _set_text { 1604sub _set_text {
… …
1493 $self->{text} = $text; 1614 $self->{text} = $text;
1494 1615
1495 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1497 1618
1498 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1499} 1620}
1500 1621
1501sub set_text { 1622sub set_text {
1502 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1503 1624
1504 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1626 $self->_set_text ($text);
1506 $self->update; 1627
1507 $self->check_size; 1628 $self->realloc;
1508} 1629}
1509 1630
1510sub get_text { 1631sub get_text {
1511 $_[0]{text} 1632 $_[0]{text}
1512} 1633}
… …
1515 my ($self) = @_; 1636 my ($self) = @_;
1516 1637
1517 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1518 1639
1519 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1641}
1527 1642
1528sub key_down { 1643sub key_down {
1529 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1530 1645
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1664 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1665 $self->_emit ('escape');
1551 } elsif ($uni) { 1666 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1553 } 1668 }
1554 1669
1555 $self->_set_text ($text); 1670 $self->_set_text ($text);
1556 $self->update; 1671
1557 $self->check_size; 1672 $self->realloc;
1558} 1673}
1559 1674
1560sub focus_in { 1675sub focus_in {
1561 my ($self) = @_; 1676 my ($self) = @_;
1562 1677
… …
1642 if ($sym == 13) { 1757 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1648 $self->update; 1763 $self->update;
1649 1764
1650 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1689 1804
1690sub new { 1805sub new {
1691 my $class = shift; 1806 my $class = shift;
1692 1807
1693 $class->SUPER::new ( 1808 $class->SUPER::new (
1694 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1695 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1697 can_hover => 1, 1813 can_hover => 1,
1698 align => 0, 1814 align => 0,
1699 valign => 0, 1815 valign => 0,
1700 can_events => 1, 1816 can_events => 1,
1701 @_ 1817 @_
1702 ) 1818 )
1703} 1819}
1704 1820
1821sub activate { }
1822
1705sub button_up { 1823sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1707 1825
1826 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate");
1711 }
1712} 1829}
1713 1830
1714sub _draw { 1831sub _draw {
1715 my ($self) = @_; 1832 my ($self) = @_;
1716 1833
… …
1745 1862
1746sub new { 1863sub new {
1747 my $class = shift; 1864 my $class = shift;
1748 1865
1749 $class->SUPER::new ( 1866 $class->SUPER::new (
1750 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1751 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 1873 state => 0,
… …
1759} 1877}
1760 1878
1761sub size_request { 1879sub size_request {
1762 my ($self) = @_; 1880 my ($self) = @_;
1763 1881
1764 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1765} 1883}
1766 1884
1767sub button_down { 1885sub button_down {
1768 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1769 1887
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1774 } 1892 }
1775} 1893}
1776 1894
1777sub _draw { 1895sub _draw {
1778 my ($self) = @_; 1896 my ($self) = @_;
1779 1897
1780 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1781 1899
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 1901
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 1905
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 1907
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 1909
… …
2053 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2061 vertical => 0, 2181 vertical => 0,
2062 can_hover => 1, 2182 can_hover => 1,
2063 inner_pad => 0.02, 2183 inner_pad => 0.02,
2064 @_ 2184 @_
2065 ); 2185 );
… …
2068 $self->update; 2188 $self->update;
2069 2189
2070 $self 2190 $self
2071} 2191}
2072 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2073sub set_value { 2204sub set_value {
2074 my ($self, $value) = @_; 2205 my ($self, $value) = @_;
2075 2206
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2208
2078 $hi = $lo + 1 if $hi <= $lo; 2209 $hi = $lo + 1 if $hi <= $lo;
2079 2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2080 $value = $lo if $value < $lo; 2213 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2214 $value = $hi - $page if $value > $hi - $page;
2082 2215
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2217 if $unit;
2085 2218
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2220
2090 if ($value != $old_value) { 2221 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2222 $self->_emit (changed => $value);
2092 $self->update; 2223 $self->update;
2093 } 2224 }
2094} 2225}
2095 2226
2096sub size_request { 2227sub size_request {
2097 my ($self) = @_; 2228 my ($self) = @_;
2098 2229
2099 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2231}
2104 2232
2105sub button_down { 2233sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2107 2235
2108 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
2109 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
2110} 2241}
2111 2242
2112sub mouse_motion { 2243sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
… …
2115 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2248
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2250
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2252
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123 } 2254 }
2124} 2255}
2125 2256
2126sub update { 2257sub update {
2127 my ($self) = @_; 2258 my ($self) = @_;
2128 2259
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2261 $self->set_value ($self->{range}[0]);
2131 2262
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
2133 2265
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2267
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2270
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2271 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2272 $value = $value * $self->{scale} + $self->{offset};
2140 2273
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2274 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2275 $self->{knob_w} = $knob_w;
2148 }); 2276 });
2149 2277
2150 $self->SUPER::update; 2278 $self->SUPER::update;
2151} 2279}
2152 2280
… …
2176 # draw handle 2304 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2306
2179 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2180} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
2181 2350
2182############################################################################# 2351#############################################################################
2183 2352
2184package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2185 2354
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2397
2229 $self->reflow; 2398 $self->reflow;
2230} 2399}
2231 2400
2232sub text_height { 2401sub text_size {
2233 my ($self, $text, $indent) = @_; 2402 my ($self, $text, $indent) = @_;
2234 2403
2235 my $layout = $self->{layout}; 2404 my $layout = $self->{layout};
2236 2405
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2407 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2408 $layout->set_markup ($text);
2240 2409
2241 ($layout->size)[1] 2410 $layout->size
2242} 2411}
2243 2412
2244sub reflow { 2413sub reflow {
2245 my ($self) = @_; 2414 my ($self) = @_;
2246 2415
2247 $self->{need_reflow}++; 2416 $self->{need_reflow}++;
2248 $self->update; 2417 $self->update;
2249} 2418}
2250 2419
2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
2428 my ($self) = @_;
2429
2430 $self->{par} = [];
2431 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433}
2434
2251sub add_paragraph { 2435sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2253 2437
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2438 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2439 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2440 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2442 }
2261 2443
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2445}
2265 2446
2266sub update { 2447sub update {
2267 my ($self) = @_; 2448 my ($self) = @_;
2268 2449
… …
2271 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2272 2453
2273 delete $self->{texture}; 2454 delete $self->{texture};
2274 2455
2275 $ROOT->on_post_alloc ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2276 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2460 my $height = 0;
2278 2461
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2280 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2281 2477
2282 $self->{height} = $height; 2478 $self->{height} = $height;
2283 2479
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2481
2287 delete $self->{texture}; 2482 delete $self->{texture};
2288 } 2483 }
2289 2484
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2293 2488
2294 my $top = int $self->{children}[1]{range}[0]; 2489 my $top = int $self->{children}[1]{range}[0];
2295 2490
2296 my $y0 = $top; 2491 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2492 my $y1 = $top + $H;
2298 2493
2299 my $y = 0; 2494 my $y = 0;
2300 2495
2301 my $layout = $self->{layout}; 2496 my $layout = $self->{layout};
2302 2497
2303 $layout->set_font ($self->{font}) if $self->{font}; 2498 $layout->set_font ($self->{font}) if $self->{font};
2304 2499
2305 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2503
2308 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2505 my $h = $par->[1];
2310 2506
2311 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2508 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2509 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2510 $layout->set_markup ($par->[4]);
2315 2511
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2513
2318 glRasterPos $par->[2], $y - $y0; 2514 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2516 }
2321 2517
2322 $y += $h; 2518 $y += $h;
2323 } 2519 }
… …
2390 2586
2391sub new { 2587sub new {
2392 my $class = shift; 2588 my $class = shift;
2393 2589
2394 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2395 state => 0, 2591 state => 0,
2396 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2397 @_ 2593 @_
2398 ); 2594 );
2399 2595
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2596 $self
2406} 2597}
2407 2598
2408sub toggle_flopper { 2599sub toggle_flopper {
2409 my ($self) = @_; 2600 my ($self) = @_;
2410 2601
2411 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2603}
2423 2604
2424############################################################################# 2605#############################################################################
2425 2606
2426package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2439} 2620}
2440 2621
2441sub set_tooltip_from { 2622sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2443 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2444 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2637 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2639 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2461 2651
2462sub size_allocate { 2652sub size_allocate {
2463 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2464 2654
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2466} 2674}
2467 2675
2468sub _draw { 2676sub _draw {
2469 my ($self) = @_; 2677 my ($self) = @_;
2470 2678
… …
2487 glVertex $w, $h; 2695 glVertex $w, $h;
2488 glVertex $w, 0; 2696 glVertex $w, 0;
2489 glEnd; 2697 glEnd;
2490 2698
2491 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2492 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2493} 2702}
2494 2703
2495############################################################################# 2704#############################################################################
2496 2705
… …
2502 2711
2503sub new { 2712sub new {
2504 my $class = shift; 2713 my $class = shift;
2505 2714
2506 my $self = $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2507 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2508 @_, 2718 @_,
2509 ); 2719 );
2510 2720
2511 if ($self->{anim} && $self->{animspeed}) { 2721 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2722 Scalar::Util::weaken (my $widget = $self);
… …
2527 2737
2528sub size_request { 2738sub size_request {
2529 (32, 8) 2739 (32, 8)
2530} 2740}
2531 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2532sub _draw { 2750sub _draw {
2533 my ($self) = @_; 2751 my ($self) = @_;
2534 2752
2535 return unless $::CONN;#d# manage and cache textures differently 2753 return unless $::CONN;
2536 2754
2537 my $face; 2755 my $face;
2538 2756
2539 if ($self->{frame}) { 2757 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2758 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2563 $self->SUPER::DESTROY; 2781 $self->SUPER::DESTROY;
2564} 2782}
2565 2783
2566############################################################################# 2784#############################################################################
2567 2785
2568package CFClient::UI::InventoryItem; 2786package CFClient::UI::Inventory;
2569 2787
2570our @ISA = CFClient::UI::HBox::; 2788our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub _item_to_desc {
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597 2789
2598sub new { 2790sub new {
2599 my $class = shift; 2791 my $class = shift;
2600 2792
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new ( 2793 my $self = $class->SUPER::new (
2608 can_hover => 1, 2794 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_, 2795 @_,
2688 ); 2796 );
2689 2797
2690 $self 2798 $self
2691} 2799}
… …
2701 or ($a->{name} cmp $b->{name}) 2809 or ($a->{name} cmp $b->{name})
2702 } @$items; 2810 } @$items;
2703 2811
2704 $self->{real_items} = \@items; 2812 $self->{real_items} = \@items;
2705 2813
2814 my $row = 0;
2706 for my $item (@items) { 2815 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2816 CFClient::Item::update_widgets $item;
2708 $item->update_item ();
2709 }
2710 2817
2711 $self->{scrolled}->add (@items); 2818 $self->{scrolled}->add (0, $row, $item->{face_widget});
2819 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2820 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2712 2821
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2822 $row++;
2714} 2823 }
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719} 2824}
2720 2825
2721############################################################################# 2826#############################################################################
2722 2827
2723package CFClient::UI::Menu; 2828package CFClient::UI::Menu;
… …
2758 2863
2759# popup given the event (must be a mouse button down event currently) 2864# popup given the event (must be a mouse button down event currently)
2760sub popup { 2865sub popup {
2761 my ($self, $ev) = @_; 2866 my ($self, $ev) = @_;
2762 2867
2763 $self->emit ("popdown"); 2868 $self->_emit ("popdown");
2764 2869
2765 # maybe save $GRAB? must be careful about events... 2870 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2871 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2872 $self->{button} = $ev->{button};
2768 2873
2769 $self->show; 2874 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2875 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 2876}
2772 2877
2773sub mouse_motion { 2878sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2775 2880
… …
2783 2888
2784 if ($ev->{button} == $self->{button}) { 2889 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2890 undef $GRAB;
2786 $self->hide; 2891 $self->hide;
2787 2892
2788 $self->emit ("popdown"); 2893 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2894 $self->{hover}[1]->() if $self->{hover};
2790 } 2895 }
2791} 2896}
2792 2897
2793############################################################################# 2898#############################################################################
… …
2855sub add { 2960sub add {
2856 my ($self, $text, %arg) = @_; 2961 my ($self, $text, %arg) = @_;
2857 2962
2858 $text =~ s/^\s+//; 2963 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 2964 $text =~ s/\s+$//;
2965
2966 return unless $text;
2860 2967
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 2968 my $timeout = time + ((delete $arg{timeout}) || 60);
2862 2969
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2970 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 2971
… …
2907use CFClient::OpenGL; 3014use CFClient::OpenGL;
2908 3015
2909sub new { 3016sub new {
2910 my $class = shift; 3017 my $class = shift;
2911 3018
2912 $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
3020 visible => 1,
2913 @_, 3021 @_,
2914 ) 3022 );
2915}
2916 3023
2917sub configure { 3024 Scalar::Util::weaken ($self->{root} = $self);
2918 my ($self, $x, $y, $w, $h) = @_;
2919 3025
2920 $self->{w} = $w; 3026 $self
2921 $self->{h} = $h;
2922}
2923
2924sub check_size {
2925 my ($self) = @_;
2926
2927 $self->size_allocate ($self->{w}, $self->{h})
2928 if $self->{w};
2929} 3027}
2930 3028
2931sub size_request { 3029sub size_request {
2932 my ($self) = @_; 3030 my ($self) = @_;
2933 3031
2934 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
3033}
3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
2935} 3047}
2936 3048
2937sub size_allocate { 3049sub size_allocate {
2938 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h) = @_;
2939 3051
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 3052 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3054
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
2951 3057
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3060
2958 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
2959 } 3062 }
2960} 3063}
2961 3064
… …
2972} 3075}
2973 3076
2974sub update { 3077sub update {
2975 my ($self) = @_; 3078 my ($self) = @_;
2976 3079
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
2979} 3081}
2980 3082
2981sub add { 3083sub add {
2982 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
2983 3085
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3086 $_->{is_toplevel} = 1
2986 3087 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3088
2992 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3090}
3091
3092sub remove {
3093 my ($self, @children) = @_;
3094
3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3099
3100 while (@children) {
3101 my $w = pop @children;
3102 push @children, $w->children;
3103 $w->set_invisible;
3104 }
2993} 3105}
2994 3106
2995sub on_refresh { 3107sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3108 my ($self, $id, $cb) = @_;
2997 3109
… …
3010 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
3011 $_->() 3123 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
3013 } 3125 }
3014 3126
3015 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
3016 my @queue = ([], []); 3128 my @queue;
3017 3129
3018 for (;;) { 3130 while () {
3019 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3020 # heuristic: check containers last 3132 #TODO use array-of-depth approach
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3133
3022 for values %{delete $self->{check_size}} 3134 use sort 'stable';
3135
3136 @queue = sort { $a->{visible} <=> $b->{visible} }
3137 @queue, values %{delete $self->{realloc}};
3023 } 3138 }
3024 3139
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3140 my $widget = pop @queue || last;
3026 3141
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3142 $widget->{visible} or last; # do not resize invisible widgets
3028 ? @$widget{qw(user_w user_h)} 3143
3029 : $widget->size_request; 3144 my ($w, $h) = $widget->size_request;
3030 3145
3146 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
3152 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3031 if (delete $widget->{force_alloc} 3153 || delete $widget->{force_realloc}) {
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034
3035 $widget->{req_w} = $w; 3154 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3155 $widget->{req_h} = $h;
3037 3156
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3157 $self->{size_alloc}{$widget+0} = $widget;
3039 3158
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3159 if (my $parent = $widget->{parent}) {
3160 $self->{realloc}{$parent+0} = $parent;
3161 #unshift @queue, $parent;
3162 $parent->{force_size_alloc} = 1;
3163 $self->{size_alloc}{$parent+0} = $parent;
3164 }
3042 } 3165 }
3166
3167 delete $self->{realloc}{$widget+0};
3043 } 3168 }
3044 } 3169 }
3045 3170
3046 while ($self->{size_alloc}) { 3171 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3172 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3173 values %$size_alloc;
3174
3175 while () {
3176 my $widget = pop @queue || last;
3177
3178 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3179
3050 $w = 0 if $w < 0; 3180 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3181 $h = 0 if $h < 0;
3052 3182
3183 $w = int $w + 0.5;
3184 $h = int $h + 0.5;
3185
3186 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3053 $widget->{w} = $w; 3187 $widget->{w} = $w;
3054 $widget->{h} = $h; 3188 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3189
3056 $widget->emit (size_allocate => $w, $h); 3190 $widget->emit (size_allocate => $w, $h);
3191 }
3057 } 3192 }
3058 } 3193 }
3059 3194
3060 while ($self->{post_alloc_hook}) { 3195 while ($self->{post_alloc_hook}) {
3061 $_->() 3196 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3197 for values %{delete $self->{post_alloc_hook}};
3063 } 3198 }
3199
3064 3200
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
3068 3204
… …
3075 $self->_draw; 3211 $self->_draw;
3076} 3212}
3077 3213
3078############################################################################# 3214#############################################################################
3079 3215
3216package CFClient::UI::SpellList;
3217
3218our @ISA = CFClient::UI::FancyFrame::;
3219
3220sub new {
3221 my $class = shift;
3222
3223 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225 $self->add (new CFClient::UI::ScrolledWindow
3226 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228 $self;
3229}
3230
3231# XXX: Do sorting? Argl...
3232sub add_spell {
3233 my ($self, $spell) = @_;
3234 $self->{spells}->{$spell->{name}} = $spell;
3235
3236 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3237 face => $spell->{face},
3238 can_hover => 1,
3239 can_events => 1,
3240 tooltip => $spell->{message});
3241
3242 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3243 text => $spell->{name},
3244 can_hover => 1,
3245 can_events => 1,
3246 tooltip => $spell->{message},
3247 expand => 1);
3248
3249 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3252 expand => 1);
3253
3254 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3255 text => "bind to key",
3256 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3257}
3258
3259sub rebuild_spell_list {
3260 my ($self) = @_;
3261 $self->{tbl_idx} = 0;
3262 $self->add_spell ($_) for values %{$self->{spells}};
3263}
3264
3265sub remove_spell {
3266 my ($self, $spell) = @_;
3267 delete $self->{spells}->{$spell->{name}};
3268 $self->rebuild_spell_list;
3269}
3270
3271#############################################################################
3272
3273package CFClient::UI::BindEditor;
3274
3275our @ISA = CFClient::UI::FancyFrame::;
3276
3277sub new {
3278 my $class = shift;
3279
3280 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3281
3282 $self->add (my $vb = new CFClient::UI::VBox);
3283
3284
3285 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3286 text => "start recording",
3287 tooltip => "Start/Stops recording of actions."
3288 ."All subsequent actions after the recording started will be captured."
3289 ."The actions are displayed after the record was stopped."
3290 ."To bind the action you have to click on the 'Bind' button",
3291 on_activate => sub {
3292 unless ($self->{recording}) {
3293 $self->start;
3294 } else {
3295 $self->stop;
3296 }
3297 });
3298
3299 $vb->add (new CFClient::UI::Label text => "Actions:");
3300 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3301
3302 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3305 $hb->add (new CFClient::UI::Button
3306 text => "bind",
3307 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3308 on_activate => sub {
3309 $self->ask_for_bind;
3310 });
3311
3312 $vb->add (my $hb = new CFClient::UI::HBox);
3313 $hb->add (new CFClient::UI::Button
3314 text => "ok",
3315 expand => 1,
3316 tooltip => "This closes the binding editor and saves the binding",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->commit;
3320 });
3321
3322 $hb->add (new CFClient::UI::Button
3323 text => "cancel",
3324 expand => 1,
3325 tooltip => "This closes the binding editor without saving",
3326 on_activate => sub {
3327 $self->hide;
3328 $self->{binding_cancel}->()
3329 if $self->{binding_cancel};
3330 });
3331
3332 $self->update_binding_widgets;
3333
3334 $self
3335}
3336
3337sub commit {
3338 my ($self) = @_;
3339 my ($mod, $sym, $cmds) = $self->get_binding;
3340 if ($sym != 0 && @$cmds > 0) {
3341 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3342 ."'. Don't forget 'Save Config'!");
3343 $self->{binding_change}->($mod, $sym, $cmds)
3344 if $self->{binding_change};
3345 } else {
3346 $::STATUSBOX->add ("No action bound, no key or action specified!");
3347 $self->{binding_cancel}->()
3348 if $self->{binding_cancel};
3349 }
3350}
3351
3352sub start {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("stop recording");
3356 $self->{recording} = 1;
3357 $self->clear_command_list;
3358 $::CONN->start_record if $::CONN;
3359}
3360
3361sub stop {
3362 my ($self) = @_;
3363
3364 $self->{rec_btn}->set_text ("start recording");
3365 $self->{recording} = 0;
3366
3367 my $rec;
3368 $rec = $::CONN->stop_record if $::CONN;
3369 return unless ref $rec eq 'ARRAY';
3370 $self->set_command_list ($rec);
3371}
3372
3373# if $commit is true, the binding will be set after the user entered a key combo
3374sub ask_for_bind {
3375 my ($self, $commit) = @_;
3376
3377 CFClient::Binder::open_binding_dialog (sub {
3378 my ($mod, $sym) = @_;
3379 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3380 $self->update_binding_widgets;
3381 $self->commit if $commit;
3382 });
3383}
3384
3385# $mod and $sym are the modifiers and key symbol
3386# $cmds is a array ref of strings (the commands)
3387# $cb is the callback that is executed on OK
3388# $ccb is the callback that is executed on CANCEL and
3389# when the binding was unsuccessful on OK
3390sub set_binding {
3391 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3392
3393 $self->clear_command_list;
3394 $self->{recording} = 0;
3395 $self->{rec_btn}->set_text ("start recording");
3396
3397 $self->{binding} = [$mod, $sym];
3398 $self->{commands} = $cmds;
3399
3400 $self->{binding_change} = $cb;
3401 $self->{binding_cancel} = $ccb;
3402
3403 $self->update_binding_widgets;
3404}
3405
3406# this is a shortcut method that asks for a binding
3407# and then just binds it.
3408sub do_quick_binding {
3409 my ($self, $cmds) = @_;
3410 $self->set_binding (undef, undef, $cmds, sub {
3411 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3412 });
3413 $self->ask_for_bind (1);
3414}
3415
3416sub update_binding_widgets {
3417 my ($self) = @_;
3418 my ($mod, $sym, $cmds) = $self->get_binding;
3419 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3420 $self->set_command_list ($cmds);
3421}
3422
3423sub get_binding {
3424 my ($self) = @_;
3425 return (
3426 $self->{binding}->[0],
3427 $self->{binding}->[1],
3428 [ grep { defined $_ } @{$self->{commands}} ]
3429 );
3430}
3431
3432sub clear_command_list {
3433 my ($self) = @_;
3434 $self->{cmdbox}->clear ();
3435}
3436
3437sub set_command_list {
3438 my ($self, $cmds) = @_;
3439
3440 $self->{cmdbox}->clear ();
3441 $self->{commands} = $cmds;
3442
3443 my $idx = 0;
3444
3445 for (@$cmds) {
3446 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3447
3448 my $i = $idx;
3449 $hb->add (new CFClient::UI::Label text => $_);
3450 $hb->add (new CFClient::UI::Button
3451 text => "delete",
3452 tooltip => "Deletes the action from the record",
3453 on_activate => sub {
3454 $self->{cmdbox}->remove ($hb);
3455 $cmds->[$i] = undef;
3456 });
3457
3458
3459 $idx++
3460 }
3461}
3462
3463#############################################################################
3464
3080package CFClient::UI; 3465package CFClient::UI;
3081 3466
3082$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3083$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3084 3469

Diff Legend

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