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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.263 by elmex, Wed May 31 14:04:52 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
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 {
… …
206 %$self = (); 242 %$self = ();
207} 243}
208 244
209sub show { 245sub show {
210 my ($self) = @_; 246 my ($self) = @_;
247
211 return if $self->{parent}; 248 return if $self->{parent};
212 249
213 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
214} 251}
215 252
216sub show_centered { 253sub set_visible {
217 my ($self) = @_; 254 my ($self) = @_;
255
218 return if $self->{parent}; 256 return if $self->{visible};
219 257
220 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
221 260
222 $CFClient::UI::ROOT->on_post_alloc ( 261 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 262
229sub hide { 263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
230 my ($self) = @_; 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};
231 277
232 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
236 if $self->{parent}; 312 if $self->{parent};
237} 313}
238 314
239sub move { 315sub move_abs {
240 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
241 317
242 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
245 321
246 $self->update; 322 $self->update;
247} 323}
248 324
249sub set_size { 325sub set_size {
250 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
251 327
252 $self->{user_w} = $w; 328 $self->{force_w} = $w;
253 $self->{user_h} = $h; 329 $self->{force_h} = $h;
254 330
255 $self->check_size; 331 $self->realloc;
256} 332}
257 333
258sub size_request { 334sub size_request {
259 require Carp; 335 require Carp;
260 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
262 338
263sub configure { 339sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
265 341
266 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
269 347
270 # use alignment to adjust x, y 348 # use alignment to adjust x, y
271 349
272 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 352 }
277 353
278 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 355 $self->{x} = $x;
280 $self->{y} = $y; 356 $self->{y} = $y;
281 $self->update; 357 $self->update;
282 } 358 }
283 359
284 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $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;
286 } 367 }
287} 368}
288 369
289sub size_allocate { 370sub size_allocate {
290 # nothing to be done 371 # nothing to be done
291} 372}
292 373
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 374sub children {
301} 375}
302 376
303sub set_max_size { 377sub set_max_size {
304 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 382}
309 383
310sub set_tooltip { 384sub set_tooltip {
311 my ($self, $tooltip) = @_; 385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
312 391
313 $self->{tooltip} = $tooltip; 392 $self->{tooltip} = $tooltip;
314 393
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 395 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 417 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
340 419
341 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
342 421
343 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
344 423
345 $focus->update if $focus; 424 $focus->update if $focus;
346 $FOCUS->update; 425 $FOCUS->update;
347} 426}
348 427
… …
351 430
352 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
353 432
354 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
355 434
356 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
357 436
358 $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;
359} 441}
360 442
361sub mouse_motion { } 443sub mouse_motion { }
362sub button_up { } 444sub button_up { }
363sub key_down { } 445sub key_down { }
364sub key_up { } 446sub key_up { }
365 447
366sub button_down { 448sub button_down {
367 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
368 450
369 $self->focus_in; 451 $self->focus_in;
… …
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376sub 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}
377 529
378sub draw { 530sub draw {
379 my ($self) = @_; 531 my ($self) = @_;
380 532
381 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
398 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
399 glEnd; 551 glEnd;
400 glDisable GL_BLEND; 552 glDisable GL_BLEND;
401 } 553 }
402 554
403 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 556 glPushMatrix;
405 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 560 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
412 glEnd; 564 glEnd;
413 glPopMatrix; 565 glPopMatrix;
414 #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;
415 } 567 }
416} 568}
417 569
418sub _draw { 570sub _draw {
419 my ($self) = @_; 571 my ($self) = @_;
420 572
421 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 574}
473 575
474sub DESTROY { 576sub DESTROY {
475 my ($self) = @_; 577 my ($self) = @_;
476 578
… …
534 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
536} 638}
537 639
538sub size_request { 640sub size_request {
539 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
540} 644}
541 645
542sub draw { } 646sub draw { }
543 647
544############################################################################# 648#############################################################################
… …
573 $self->{children} = [ 677 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
576 ]; 680 ];
577 681
578 $self->check_size (1); 682 $self->realloc;
579 $self->update;
580} 683}
581 684
582sub children { 685sub children {
583 @{ $_[0]{children} } 686 @{ $_[0]{children} }
584} 687}
… …
589 delete $child->{parent}; 692 delete $child->{parent};
590 $child->hide; 693 $child->hide;
591 694
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 696
594 $self->check_size; 697 $self->realloc;
595 $self->update;
596} 698}
597 699
598sub clear { 700sub clear {
599 my ($self) = @_; 701 my ($self) = @_;
600 702
… …
604 for (@$children) { 706 for (@$children) {
605 delete $_->{parent}; 707 delete $_->{parent};
606 $_->hide; 708 $_->hide;
607 } 709 }
608 710
609 $self->check_size; 711 $self->realloc;
610 $self->update;
611} 712}
612 713
613sub find_widget { 714sub find_widget {
614 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
615 716
… …
739 840
740package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
741 842
742our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
743 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
744sub size_request { 855sub size_request {
745 my ($self) = @_; 856 my ($self) = @_;
746 857
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 859
750 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
751} 864}
752 865
753sub size_allocate { 866sub size_allocate {
754 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
755 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);
756 $self->update; 875 $self->update;
757} 876}
758 877
759sub set_offset { 878sub set_offset {
760 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
811 my $class = shift; 930 my $class = shift;
812 931
813 my $self; 932 my $self;
814 933
815 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
816 vertical => 1, 935 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 937 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
820 }, 939 },
821 ; 940 ;
822 941
823 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 943 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
832 951
833 $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]);
834} 972}
835 973
836#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 975# update viewport offset on scroll
838 976
… …
882 1020
883our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
884 1022
885use CFClient::OpenGL; 1023use CFClient::OpenGL;
886 1024
887my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 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);
890 1032
891sub new { 1033sub new {
892 my $class = shift; 1034 my $class = shift;
893 1035
894 # TODO: user_x, user_y, overwrite moveto?
895
896 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1039 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
902 @_ 1043 @_
903 ); 1044 );
904 1045
905 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 1047 align => 0,
… …
959 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
960 1101
961 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
963 1104
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size;
968 }; 1110 };
969 1111
970 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1116 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
976 1118
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
978 1120
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update;
981 }; 1122 };
982 } 1123 }
983} 1124}
984 1125
985sub button_up { 1126sub button_up {
… …
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1146
1006 my $border = $self->border; 1147 my $border = $self->border;
1007 1148
1008 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1154
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1016 1157
1017 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1163 }
1028 1164
1029 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1030 1166
… …
1046sub new { 1182sub new {
1047 my $class = shift; 1183 my $class = shift;
1048 1184
1049 $class->SUPER::new ( 1185 $class->SUPER::new (
1050 col_expand => [], 1186 col_expand => [],
1051 @_ 1187 @_,
1052 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1193}
1054 1194
1055sub add { 1195sub add {
1056 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1057 1197
1058 $child->set_parent ($self); 1198 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1060 1200
1061 $child->check_size; 1201 $self->realloc;
1062} 1202}
1063 1203
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# 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?
1069sub clear { 1205sub clear {
1070 my ($self) = @_; 1206 my ($self) = @_;
1071 1207
1072 my @children = $self->children; 1208 my @children = $self->children;
1073 delete $self->{children}; 1209 delete $self->{children};
… …
1075 for (@children) { 1211 for (@children) {
1076 delete $_->{parent}; 1212 delete $_->{parent};
1077 $_->hide; 1213 $_->hide;
1078 } 1214 }
1079 1215
1080 $self->update; 1216 $self->realloc;
1081} 1217}
1082 1218
1083sub get_wh { 1219sub get_wh {
1084 my ($self) = @_; 1220 my ($self) = @_;
1085 1221
… …
1116sub size_allocate { 1252sub size_allocate {
1117 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1118 1254
1119 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1120 1256
1121 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1123 1259
1124 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1317 }
1182} 1318}
1183 1319
1184############################################################################# 1320#############################################################################
1185 1321
1186package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1323
1190our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1191 1325
1192sub size_request { 1326sub size_request {
1193 my ($self) = @_; 1327 my ($self) = @_;
1194 1328
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1196 1330 ? (
1197 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1333 )
1200 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1201} 1338}
1202 1339
1203sub size_allocate { 1340sub size_allocate {
1204 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1205 1342
1206 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1344 my $children = $self->{children};
1209 1345
1210 my @h = map $_->{req_w}, @$children; 1346 my @req;
1211 1347
1212 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1213 1349 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } 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 {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1364 }
1228 } 1365 }
1229 1366
1230 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1231 1368
1232 my $y = 0; 1369 my $pos = 0;
1233 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1373
1238 $y += $h; 1374 $pos += $alloc;
1239 } 1375 }
1240 1376
1241 1 1377 1
1242} 1378}
1243 1379
1244############################################################################# 1380#############################################################################
1245 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
1246package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1247 1398
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1251 1400
1252sub size_request { 1401sub new {
1253 my ($self) = @_; 1402 my $class = shift;
1254 1403
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1256 1405 vertical => 1,
1257 ( 1406 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1407 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1408}
1301 1409
1302############################################################################# 1410#############################################################################
1303 1411
1304package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1429 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1323 fontsize => 1, 1431 fontsize => 1,
1324 align => -1, 1432 align => -1,
1325 valign => -1, 1433 valign => -1,
1326 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1327 can_events => 0, 1436 can_events => 0,
1328 %arg 1437 %arg
1329 ); 1438 );
1330 1439
1331 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1368 1477
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1371 1480
1481 $self->realloc;
1372 $self->update; 1482 $self->update;
1373 $self->check_size;
1374} 1483}
1375 1484
1376sub set_markup { 1485sub set_markup {
1377 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1378 1487
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1492
1384 $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;
1385 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1386 1495
1496 $self->realloc;
1387 $self->update; 1497 $self->update;
1388 $self->check_size;
1389} 1498}
1390 1499
1391sub size_request { 1500sub size_request {
1392 my ($self) = @_; 1501 my ($self) = @_;
1393 1502
… …
1407 1516
1408 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1410 } 1519 }
1411 1520
1412 ( 1521 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1522}
1417 1523
1418sub size_allocate { 1524sub size_allocate {
1419 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1420 1526
… …
1425 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1426 1532
1427 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1534 delete $self->{texture};
1429 1535
1430 $self->update; 1536 $self->realloc;
1431 $self->check_size;
1432} 1537}
1433 1538
1434sub _draw { 1539sub _draw {
1435 my ($self) = @_; 1540 my ($self) = @_;
1436 1541
… …
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1551
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1448 1553
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1452 1557
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1456 1561
1457 $tex 1562 $tex
1458 }; 1563 };
1459 1564
… …
1488 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1489 can_hover => 1, 1594 can_hover => 1,
1490 can_focus => 1, 1595 can_focus => 1,
1491 valign => 0, 1596 valign => 0,
1492 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1493 @_ 1599 @_
1494 ) 1600 )
1495} 1601}
1496 1602
1497sub _set_text { 1603sub _set_text {
… …
1507 $self->{text} = $text; 1613 $self->{text} = $text;
1508 1614
1509 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1511 1617
1512 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1513} 1619}
1514 1620
1515sub set_text { 1621sub set_text {
1516 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1517 1623
1518 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1625 $self->_set_text ($text);
1520 $self->update; 1626
1521 $self->check_size; 1627 $self->realloc;
1522} 1628}
1523 1629
1524sub get_text { 1630sub get_text {
1525 $_[0]{text} 1631 $_[0]{text}
1526} 1632}
… …
1529 my ($self) = @_; 1635 my ($self) = @_;
1530 1636
1531 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1532 1638
1533 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1640}
1541 1641
1542sub key_down { 1642sub key_down {
1543 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1544 1644
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1663 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1664 $self->_emit ('escape');
1565 } elsif ($uni) { 1665 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1667 }
1568 1668
1569 $self->_set_text ($text); 1669 $self->_set_text ($text);
1570 $self->update; 1670
1571 $self->check_size; 1671 $self->realloc;
1572} 1672}
1573 1673
1574sub focus_in { 1674sub focus_in {
1575 my ($self) = @_; 1675 my ($self) = @_;
1576 1676
… …
1656 if ($sym == 13) { 1756 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1662 $self->update; 1762 $self->update;
1663 1763
1664 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1703 1803
1704sub new { 1804sub new {
1705 my $class = shift; 1805 my $class = shift;
1706 1806
1707 $class->SUPER::new ( 1807 $class->SUPER::new (
1708 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1709 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1711 can_hover => 1, 1812 can_hover => 1,
1712 align => 0, 1813 align => 0,
1713 valign => 0, 1814 valign => 0,
1714 can_events => 1, 1815 can_events => 1,
1715 @_ 1816 @_
1716 ) 1817 )
1717} 1818}
1718 1819
1820sub activate { }
1821
1719sub button_up { 1822sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1721 1824
1825 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1828}
1727 1829
1728sub _draw { 1830sub _draw {
1729 my ($self) = @_; 1831 my ($self) = @_;
1730 1832
… …
1759 1861
1760sub new { 1862sub new {
1761 my $class = shift; 1863 my $class = shift;
1762 1864
1763 $class->SUPER::new ( 1865 $class->SUPER::new (
1764 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1765 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1872 state => 0,
… …
1773} 1876}
1774 1877
1775sub size_request { 1878sub size_request {
1776 my ($self) = @_; 1879 my ($self) = @_;
1777 1880
1778 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1779} 1882}
1780 1883
1781sub button_down { 1884sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1783 1886
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1788 } 1891 }
1789} 1892}
1790 1893
1791sub _draw { 1894sub _draw {
1792 my ($self) = @_; 1895 my ($self) = @_;
1793 1896
1794 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1795 1898
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1900
1798 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;
1799 1904
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1906
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1908
… …
2067 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2075 vertical => 0, 2180 vertical => 0,
2076 can_hover => 1, 2181 can_hover => 1,
2077 inner_pad => 0.02, 2182 inner_pad => 0.02,
2078 @_ 2183 @_
2079 ); 2184 );
… …
2082 $self->update; 2187 $self->update;
2083 2188
2084 $self 2189 $self
2085} 2190}
2086 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
2087sub set_value { 2203sub set_value {
2088 my ($self, $value) = @_; 2204 my ($self, $value) = @_;
2089 2205
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2207
2092 $hi = $lo + 1 if $hi <= $lo; 2208 $hi = $lo + 1 if $hi <= $lo;
2093 2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2094 $value = $lo if $value < $lo; 2212 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2213 $value = $hi - $page if $value > $hi - $page;
2096 2214
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2216 if $unit;
2099 2217
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2219
2104 if ($value != $old_value) { 2220 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2221 $self->_emit (changed => $value);
2106 $self->update; 2222 $self->update;
2107 } 2223 }
2108} 2224}
2109 2225
2110sub size_request { 2226sub size_request {
2111 my ($self) = @_; 2227 my ($self) = @_;
2112 2228
2113 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2230}
2118 2231
2119sub button_down { 2232sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2121 2234
2122 $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
2123 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2124} 2240}
2125 2241
2126sub mouse_motion { 2242sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2247
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2249
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2251
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2253 }
2138} 2254}
2139 2255
2140sub update { 2256sub update {
2141 my ($self) = @_; 2257 my ($self) = @_;
2142 2258
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2260 $self->set_value ($self->{range}[0]);
2145 2261
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2147 2264
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2266
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2269
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2270 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2271 $value = $value * $self->{scale} + $self->{offset};
2154 2272
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2274 $self->{knob_w} = $knob_w;
2162 }); 2275 });
2163 2276
2164 $self->SUPER::update; 2277 $self->SUPER::update;
2165} 2278}
2166 2279
… …
2190 # draw handle 2303 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2305
2193 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2194} 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 (@_) }
2195 2349
2196############################################################################# 2350#############################################################################
2197 2351
2198package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2199 2353
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2396
2243 $self->reflow; 2397 $self->reflow;
2244} 2398}
2245 2399
2246sub text_height { 2400sub text_size {
2247 my ($self, $text, $indent) = @_; 2401 my ($self, $text, $indent) = @_;
2248 2402
2249 my $layout = $self->{layout}; 2403 my $layout = $self->{layout};
2250 2404
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2407 $layout->set_markup ($text);
2254 2408
2255 ($layout->size)[1] 2409 $layout->size
2256} 2410}
2257 2411
2258sub reflow { 2412sub reflow {
2259 my ($self) = @_; 2413 my ($self) = @_;
2260 2414
2261 $self->{need_reflow}++; 2415 $self->{need_reflow}++;
2262 $self->update; 2416 $self->update;
2263} 2417}
2264 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
2265sub add_paragraph { 2434sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2267 2436
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2437 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2438 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2439 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2441 }
2275 2442
2276 $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]);
2277 $self->{children}[1]->update;
2278} 2444}
2279 2445
2280sub update { 2446sub update {
2281 my ($self) = @_; 2447 my ($self) = @_;
2282 2448
… …
2285 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2286 2452
2287 delete $self->{texture}; 2453 delete $self->{texture};
2288 2454
2289 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2290 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2459 my $height = 0;
2292 2460
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2294 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 }
2295 2476
2296 $self->{height} = $height; 2477 $self->{height} = $height;
2297 2478
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2480
2301 delete $self->{texture}; 2481 delete $self->{texture};
2302 } 2482 }
2303 2483
2304 $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 {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2307 2487
2308 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2309 2489
2310 my $y0 = $top; 2490 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2312 2492
2313 my $y = 0; 2493 my $y = 0;
2314 2494
2315 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2316 2496
2317 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2318 2498
2319 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2502
2322 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2504 my $h = $par->[1];
2324 2505
2325 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2508 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2509 $layout->set_markup ($par->[4]);
2329 2510
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2512
2332 glRasterPos $par->[2], $y - $y0; 2513 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2515 }
2335 2516
2336 $y += $h; 2517 $y += $h;
2337 } 2518 }
… …
2404 2585
2405sub new { 2586sub new {
2406 my $class = shift; 2587 my $class = shift;
2407 2588
2408 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2409 state => 0, 2590 state => 0,
2410 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2411 @_ 2592 @_
2412 ); 2593 );
2413 2594
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2595 $self
2420} 2596}
2421 2597
2422sub toggle_flopper { 2598sub toggle_flopper {
2423 my ($self) = @_; 2599 my ($self) = @_;
2424 2600
2425 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2602}
2437 2603
2438############################################################################# 2604#############################################################################
2439 2605
2440package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2453} 2619}
2454 2620
2455sub set_tooltip_from { 2621sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2457 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
2458 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2636 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2638 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2650
2476sub size_allocate { 2651sub size_allocate {
2477 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2478 2653
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
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 });
2480} 2673}
2481 2674
2482sub _draw { 2675sub _draw {
2483 my ($self) = @_; 2676 my ($self) = @_;
2484 2677
… …
2501 glVertex $w, $h; 2694 glVertex $w, $h;
2502 glVertex $w, 0; 2695 glVertex $w, 0;
2503 glEnd; 2696 glEnd;
2504 2697
2505 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2506 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2507} 2701}
2508 2702
2509############################################################################# 2703#############################################################################
2510 2704
… …
2516 2710
2517sub new { 2711sub new {
2518 my $class = shift; 2712 my $class = shift;
2519 2713
2520 my $self = $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2521 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2522 @_, 2717 @_,
2523 ); 2718 );
2524 2719
2525 if ($self->{anim} && $self->{animspeed}) { 2720 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2721 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2747}
2553 2748
2554sub _draw { 2749sub _draw {
2555 my ($self) = @_; 2750 my ($self) = @_;
2556 2751
2557 return unless $::CONN;#d# manage and cache textures differently 2752 return unless $::CONN;
2558 2753
2559 my $face; 2754 my $face;
2560 2755
2561 if ($self->{frame}) { 2756 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2757 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2585 $self->SUPER::DESTROY; 2780 $self->SUPER::DESTROY;
2586} 2781}
2587 2782
2588############################################################################# 2783#############################################################################
2589 2784
2590package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2591 2786
2592our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619 2788
2620sub new { 2789sub new {
2621 my $class = shift; 2790 my $class = shift;
2622 2791
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2630 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if ($ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) {
2649 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2651 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2652 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2653 (
2654 $item->{flags} & Crossfire::Protocol::F_LOCKED
2655 ? (
2656 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2657 )
2658 : (
2659 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2660 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2661 )
2662 ),
2663 );
2664
2665 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2666 }
2667
2668 1
2669 },
2670 %args
2671 );
2672
2673
2674 $self->add (new CFClient::UI::Face
2675 can_events => 0,
2676 face => $item->{face},
2677 anim => $item->{anim},
2678 animspeed => $item->{animspeed},
2679 );
2680
2681 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2682
2683 $self->{item} = $item;
2684
2685 $self->update_item;
2686
2687 $self
2688}
2689
2690sub update_item {
2691 my ($self) = @_;
2692
2693 my $desc = _item_to_desc ($self->{item});
2694
2695 $self->{name_lbl}->set_text ($desc);
2696}
2697
2698#############################################################################
2699
2700package CFClient::UI::Inventory;
2701
2702our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox),
2709 @_, 2794 @_,
2710 ); 2795 );
2711 2796
2712 $self 2797 $self
2713} 2798}
… …
2723 or ($a->{name} cmp $b->{name}) 2808 or ($a->{name} cmp $b->{name})
2724 } @$items; 2809 } @$items;
2725 2810
2726 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2727 2812
2813 my $row = 0;
2728 for my $item (@items) { 2814 for my $item (@items) {
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2815 CFClient::Item::update_widgets $item;
2730 $item->update_item ();
2731 }
2732 2816
2733 $self->{scrolled}->add (@items); 2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2734 2820
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2736} 2822 }
2737
2738sub size_request {
2739 my ($self) = @_;
2740 ($self->{req_w}, $self->{req_h});
2741} 2823}
2742 2824
2743############################################################################# 2825#############################################################################
2744 2826
2745package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2780 2862
2781# 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)
2782sub popup { 2864sub popup {
2783 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2784 2866
2785 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2786 2868
2787 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2788 $GRAB = $self; 2870 $GRAB = $self;
2789 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2790 2872
2791 $self->show; 2873 $self->show;
2792 $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);
2793} 2875}
2794 2876
2795sub mouse_motion { 2877sub mouse_motion {
2796 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2797 2879
… …
2805 2887
2806 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2807 undef $GRAB; 2889 undef $GRAB;
2808 $self->hide; 2890 $self->hide;
2809 2891
2810 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2811 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2812 } 2894 }
2813} 2895}
2814 2896
2815############################################################################# 2897#############################################################################
… …
2877sub add { 2959sub add {
2878 my ($self, $text, %arg) = @_; 2960 my ($self, $text, %arg) = @_;
2879 2961
2880 $text =~ s/^\s+//; 2962 $text =~ s/^\s+//;
2881 $text =~ s/\s+$//; 2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2882 2966
2883 my $timeout = time + ((delete $arg{timeout}) || 60); 2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2884 2968
2885 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2886 2970
… …
2929use CFClient::OpenGL; 3013use CFClient::OpenGL;
2930 3014
2931sub new { 3015sub new {
2932 my $class = shift; 3016 my $class = shift;
2933 3017
2934 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3019 visible => 1,
2935 @_, 3020 @_,
2936 ) 3021 );
2937}
2938 3022
2939sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2940 my ($self, $x, $y, $w, $h) = @_;
2941 3024
2942 $self->{w} = $w; 3025 $self
2943 $self->{h} = $h;
2944}
2945
2946sub check_size {
2947 my ($self) = @_;
2948
2949 $self->size_allocate ($self->{w}, $self->{h})
2950 if $self->{w};
2951} 3026}
2952 3027
2953sub size_request { 3028sub size_request {
2954 my ($self) = @_; 3029 my ($self) = @_;
2955 3030
2956 ($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
2957} 3046}
2958 3047
2959sub size_allocate { 3048sub size_allocate {
2960 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2961 3050
2962 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967
2968 for my $child ($self->children) { 3051 for my $child ($self->children) {
2969 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)};
2970 3053
2971 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
2972 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2973 3056
2974 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
2975 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
2976
2977 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2978 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2979 3059
2980 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2981 } 3061 }
2982} 3062}
2983 3063
… …
2994} 3074}
2995 3075
2996sub update { 3076sub update {
2997 my ($self) = @_; 3077 my ($self) = @_;
2998 3078
2999 $self->check_size;
3000 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3001} 3080}
3002 3081
3003sub add { 3082sub add {
3004 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3005 3084
3006 for my $child (@children) {
3007 $child->{toplevel} = 1; 3085 $_->{is_toplevel} = 1
3008 3086 for @children;
3009 # integerise window positions
3010 $child->{x} = int $child->{x};
3011 $child->{y} = int $child->{y};
3012 }
3013 3087
3014 $self->SUPER::add (@children); 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;
3015 3098
3016 while (@children) { 3099 while (@children) {
3017 my $w = pop @children; 3100 my $w = pop @children;
3018 push @children, $w->children; 3101 push @children, $w->children;
3019 $w->{visible} = 1; 3102 $w->set_invisible;
3020 }
3021}
3022
3023sub remove {
3024 my ($self, @children) = @_;
3025
3026 $self->SUPER::remove (@children);
3027
3028 while (@children) {
3029 my $w = pop @children;
3030 push @children, $w->children;
3031 delete $w->{visible};
3032 } 3103 }
3033} 3104}
3034 3105
3035sub on_refresh { 3106sub on_refresh {
3036 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
… …
3050 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3051 $_->() 3122 $_->()
3052 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3053 } 3124 }
3054 3125
3055 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3056 my @queue = ([], []); 3127 my @queue;
3057 3128
3058 for (;;) { 3129 while () {
3059 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3060 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3061 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3062 for values %{delete $self->{check_size}} 3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3063 } 3137 }
3064 3138
3065 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3139 my $widget = pop @queue || last;
3066 3140
3067 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 $widget->{visible} or last; # do not resize invisible widgets
3068 ? @$widget{qw(user_w user_h)} 3142
3069 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3070 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
3071 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3072 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3073 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3074
3075 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3076 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3077 3155
3078 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3079 3157
3080 $widget->{parent}->check_size
3081 if $widget->{parent}; 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 }
3082 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3083 } 3167 }
3084 } 3168 }
3085 3169
3086 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3087 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3088 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3089 3178
3090 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3091 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3092 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}) {
3093 $widget->{w} = $w; 3186 $widget->{w} = $w;
3094 $widget->{h} = $h; 3187 $widget->{h} = $h;
3095 $widget->size_allocate ($w, $h); 3188
3096 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3097 } 3191 }
3098 } 3192 }
3099 3193
3100 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3101 $_->() 3195 $_->()
3102 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3103 } 3197 }
3198
3104 3199
3105 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3106 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3107 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3108 3203
… …
3115 $self->_draw; 3210 $self->_draw;
3116} 3211}
3117 3212
3118############################################################################# 3213#############################################################################
3119 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440
3441 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3443 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3444 expand => 1);
3445
3446 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3447 text => "bind to key",
3448 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3449}
3450
3451sub rebuild_spell_list {
3452 my ($self) = @_;
3453 $self->{tbl_idx} = 0;
3454 $self->add_spell ($_) for values %{$self->{spells}};
3455}
3456
3457sub remove_spell {
3458 my ($self, $spell) = @_;
3459 delete $self->{spells}->{$spell->{name}};
3460 $self->rebuild_spell_list;
3461}
3462
3463#############################################################################
3464
3120package CFClient::UI; 3465package CFClient::UI;
3121 3466
3122$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3123$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3124 3469

Diff Legend

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