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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.260 by elmex, Tue May 30 14:35:09 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 74 if $FOCUS;
46} 75}
47 76
48sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 79 if $FOCUS;
51} 80}
52 81
53sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
54 my ($ev) = @_; 83 my ($ev) = @_;
… …
63 check_tooltip; 92 check_tooltip;
64 } 93 }
65 94
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 96
68 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 99}
73 100
74sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
75 my ($ev) = @_; 102 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
77 104
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 106
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 108
82 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 111
87 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 114 $grab->update if $grab;
90 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 132
108 check_tooltip; 133 check_tooltip;
109 } 134 }
110 135
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 137 if $HOVER;
115} 138}
116 139
117# convert position array to integers 140# convert position array to integers
118sub harmonize { 141sub harmonize {
119 my ($vals) = @_; 142 my ($vals) = @_;
… …
125 $rem += $_ - $i; 148 $rem += $_ - $i;
126 $_ = $i; 149 $_ = $i;
127 } 150 }
128} 151}
129 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
130############################################################################# 194#############################################################################
131 195
132package CFClient::UI::Base; 196package CFClient::UI::Base;
133 197
134use strict; 198use strict;
… …
137 201
138sub new { 202sub new {
139 my $class = shift; 203 my $class = shift;
140 204
141 my $self = bless { 205 my $self = bless {
142 x => 0, 206 x => "center",
143 y => 0, 207 y => "center",
144 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
145 can_events => 1, 211 can_events => 1,
146 @_ 212 @_
147 }, $class; 213 }, $class;
148 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
149 for (keys %$self) { 217 for (keys %$self) {
150 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
152 } 220 }
153 } 221 }
154 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
155 $self 235 $self
156} 236}
157 237
158sub destroy { 238sub destroy {
159 my ($self) = @_; 239 my ($self) = @_;
… …
168 return if $self->{parent}; 248 return if $self->{parent};
169 249
170 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
171} 251}
172 252
173sub hide { 253sub set_visible {
174 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};
175 277
176 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
178 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
179 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
180 if $self->{parent}; 312 if $self->{parent};
181} 313}
182 314
183sub move { 315sub move_abs {
184 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
185 317
186 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
189 321
190 $self->update; 322 $self->update;
191} 323}
192 324
193sub set_size { 325sub set_size {
194 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
195 327
196 $self->{user_w} = $w; 328 $self->{force_w} = $w;
197 $self->{user_h} = $h; 329 $self->{force_h} = $h;
198 330
199 $self->check_size; 331 $self->realloc;
200} 332}
201 333
202sub size_request { 334sub size_request {
203 require Carp; 335 require Carp;
204 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
206 338
207sub configure { 339sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
209 341
210 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
213 347
214 # use alignment to adjust x, y 348 # use alignment to adjust x, y
215 349
216 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 352 }
221 353
222 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 355 $self->{x} = $x;
224 $self->{y} = $y; 356 $self->{y} = $y;
225 $self->update; 357 $self->update;
226 } 358 }
227 359
228 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
229 $self->{w} = $w; 363 $self->{alloc_w} = $w;
230 $self->{h} = $h; 364 $self->{alloc_h} = $h;
231 365
232 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 367 }
235} 368}
236 369
237sub size_allocate { 370sub size_allocate {
238 # nothing to be done 371 # nothing to be done
… …
246 379
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 382}
250 383
251# return top left coordinates 384sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
254 386
255 $self->{parent} 387 $tooltip =~ s/^\s+//;
256 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
257 389
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
259} 398}
260 399
261# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
262sub coord2local { 401sub coord2local {
263 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
264 403
265 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 405}
268 406
269# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
270sub coord2global { 408sub coord2global {
271 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
272 410
273 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 412}
276 413
277sub focus_in { 414sub focus_in {
278 my ($self) = @_; 415 my ($self) = @_;
279 416
280 return if $FOCUS == $self; 417 return if $FOCUS == $self;
281 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
282 419
283 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
284 421
285 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
286 423
287 $focus->update if $focus; 424 $focus->update if $focus;
288 $FOCUS->update; 425 $FOCUS->update;
289} 426}
290 427
… …
293 430
294 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
295 432
296 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
297 434
298 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
299 436
300 $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;
301} 441}
302 442
303sub mouse_motion { } 443sub mouse_motion { }
304sub button_up { } 444sub button_up { }
305sub key_down { } 445sub key_down { }
306sub key_up { } 446sub key_up { }
307 447
308sub button_down { 448sub button_down {
309 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
310 450
311 $self->focus_in; 451 $self->focus_in;
… …
314sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
315sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
316sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
317sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
318sub 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}
319 529
320sub draw { 530sub draw {
321 my ($self) = @_; 531 my ($self) = @_;
322 532
323 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
340 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
341 glEnd; 551 glEnd;
342 glDisable GL_BLEND; 552 glDisable GL_BLEND;
343 } 553 }
344 554
345 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
346 glPushMatrix; 556 glPushMatrix;
347 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0; 560 glVertex 0 , 0;
351 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
352 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
353 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
354 glEnd; 564 glEnd;
355 glPopMatrix; 565 glPopMatrix;
356 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;
357 } 567 }
358} 568}
359 569
360sub _draw { 570sub _draw {
361 my ($self) = @_; 571 my ($self) = @_;
362 572
363 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
364} 574}
365 575
366sub find_widget {
367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
370
371 return $self
372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
374
375 ()
376}
377
378sub set_parent {
379 my ($self, $parent) = @_;
380
381 Scalar::Util::weaken ($self->{parent} = $parent);
382}
383
384sub check_size {
385 my ($self) = @_;
386
387 $self->{parent}
388 or return 1;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408}
409
410sub update {
411 my ($self) = @_;
412
413 $self->{parent}->update
414 if $self->{parent};
415}
416
417sub connect {
418 my ($self, $signal, $cb) = @_;
419
420 push @{ $self->{signal_cb}{$signal} }, $cb;
421}
422
423sub emit {
424 my ($self, $signal, @args) = @_;
425
426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
427}
428
429sub DESTROY { 576sub DESTROY {
430 my ($self) = @_; 577 my ($self) = @_;
431 578
579 delete $WIDGET{$self+0};
432 #$self->deactivate; 580 #$self->deactivate;
433} 581}
434 582
435############################################################################# 583#############################################################################
436 584
… …
445 my $class = shift; 593 my $class = shift;
446 594
447 # range [value, low, high, page] 595 # range [value, low, high, page]
448 596
449 $class->SUPER::new ( 597 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
452 @_ 600 @_
453 ) 601 )
454} 602}
455 603
456sub _draw { 604sub _draw {
457 my ($self) = @_; 605 my ($self) = @_;
458 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
460 613
461 glEnable GL_BLEND; 614 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
464 617
465 glBegin GL_QUADS; 618 glBegin GL_QUADS;
466 glVertex 0 , 0; 619 glVertex 0 , 0;
467 glVertex 0 , $h; 620 glVertex 0 , $h;
468 glVertex $w, $h; 621 glVertex $w, $h;
469 glVertex $w, 0; 622 glVertex $w, 0;
470 glEnd; 623 glEnd;
471 624
472 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
473} 627}
474 628
475############################################################################# 629#############################################################################
476 630
477package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
482 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
484} 638}
485 639
486sub size_request { 640sub size_request {
487 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
488} 644}
489 645
490sub draw { } 646sub draw { }
491 647
492############################################################################# 648#############################################################################
… …
509 665
510 $self 666 $self
511} 667}
512 668
513sub add { 669sub add {
514 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
515 671
516 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
517 674
518 use sort 'stable'; 675 use sort 'stable';
519 676
520 $self->{children} = [ 677 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
523 ]; 680 ];
524 681
525 $child->check_size; 682 $self->realloc;
526} 683}
527 684
528sub children { 685sub children {
529 @{ $_[0]{children} } 686 @{ $_[0]{children} }
530} 687}
… …
535 delete $child->{parent}; 692 delete $child->{parent};
536 $child->hide; 693 $child->hide;
537 694
538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
539 696
540 $self->check_size; 697 $self->realloc;
541 $self->update;
542} 698}
543 699
544sub clear { 700sub clear {
545 my ($self) = @_; 701 my ($self) = @_;
546 702
… …
549 705
550 for (@$children) { 706 for (@$children) {
551 delete $_->{parent}; 707 delete $_->{parent};
552 $_->hide; 708 $_->hide;
553 } 709 }
710
711 $self->realloc;
554} 712}
555 713
556sub find_widget { 714sub find_widget {
557 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
558 716
… …
633} 791}
634 792
635sub update { 793sub update {
636 my ($self) = @_; 794 my ($self) = @_;
637 795
638 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 797 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 798}
652 799
653sub size_allocate { 800sub size_allocate {
654 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
655 802
656 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
657 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
658 $self->render_chld; 818 $self->_render;
819 };
659} 820}
660 821
661sub _draw { 822sub _draw {
662 my ($self) = @_; 823 my ($self) = @_;
663 824
664 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
665 826
666 my $tex = $self->{texture} 827 my $tex = $self->{texture}
667 or return; 828 or return;
668 829
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
673 833
674 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 835
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
678} 837}
679 838
680############################################################################# 839#############################################################################
681 840
682package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
683 842
684our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
685
686sub new { die }
687
688sub size_request {
689 my ($self) = @_;
690
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693
694 @$self{qw(child_w child_h)}
695}
696
697sub _draw {
698 my ($self) = @_;
699
700 $self->{children}[1]->draw;
701}
702
703
704#############################################################################
705
706package CFClient::UI::Frame;
707
708our @ISA = CFClient::UI::Bin::;
709
710use CFClient::OpenGL;
711 844
712sub new { 845sub new {
713 my $class = shift; 846 my $class = shift;
714 847
715 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
716 bg => [1, 1, 1, 1], 849 scroll_x => 0,
717 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
718 border => 0.8,
719 @_ 851 @_,
720 ); 852 )
721
722 $self
723} 853}
724 854
725sub _draw { 855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
726 my ($self) = @_; 867 my ($self, $w, $h) = @_;
727 868
728 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
729 870
730 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
732 glEnable GL_TEXTURE_2D;
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 873
735# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
736# glColor 0, 0, 0, 0; 875 $self->update;
737# glVertex 0 , 0; 876}
738# glVertex 0 , $h;
739# glVertex $w, $h;
740# glVertex $w, 0;
741# glEnd;
742 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
743 880
744 $self->child->draw; 881 $self->{view_x} = int $x;
745 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
746 glDisable GL_TEXTURE_2D; 883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
747} 921}
748 922
749############################################################################# 923#############################################################################
750 924
751package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
752 926
753our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
754
755use CFClient::OpenGL;
756
757my @tex =
758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760 928
761sub new { 929sub new {
762 my $class = shift; 930 my $class = shift;
763 931
764 # TODO: user_x, user_y, overwrite moveto? 932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
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]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
765 1035
766 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
769 border => 0.8, 1039 border => 0.6,
770 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
771 @_ 1043 @_
772 ); 1044 );
773 1045
774 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 1047 align => 0,
776 valign => 1, 1048 valign => 1,
777 text => $self->{title}, 1049 text => $self->{title},
778 fontsize => 1; 1050 fontsize => $self->{border};
779 1051
780 $self 1052 $self
781} 1053}
782 1054
783sub border { 1055sub border {
… …
799 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
800 1072
801 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
803 1075
804 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
805 if $self->{title}; 1077 if $self->{title};
806 1078
807 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
808} 1080}
809 1081
810sub button_down { 1082sub button_down {
811 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
812 1084
1085 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 1086 my $border = $self->border;
814 1087
815 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
820 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
821 $self->{motion} = sub { 1099 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
823 1101
824 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
825 1104
826 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
828 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
829 }; 1110 };
830 1111
831 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
836 1115
837 $self->{motion} = sub { 1116 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
839 1118
840 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
841 1120
842 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
843 $self->update;
844 }; 1122 };
845 } 1123 }
846} 1124}
847 1125
848sub button_up { 1126sub button_up {
… …
861 my ($self) = @_; 1139 my ($self) = @_;
862 1140
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 1143
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1146
871 my $border = $self->border; 1147 my $border = $self->border;
872 1148
873 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1154
879 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
880 1157
881 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
883 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
884 1161 $bg->{t} = $ch / $bg->{h};
885 glColor @{ $self->{bg} };
886
887 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
891 1164
892 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1166
895 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
896 $self->child->draw; 1169 $self->child->draw;
897} 1170}
898 1171
899############################################################################# 1172#############################################################################
900 1173
… …
909sub new { 1182sub new {
910 my $class = shift; 1183 my $class = shift;
911 1184
912 $class->SUPER::new ( 1185 $class->SUPER::new (
913 col_expand => [], 1186 col_expand => [],
914 @_ 1187 @_,
915 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
916} 1193}
917 1194
918sub add { 1195sub add {
919 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
920 1197
921 $child->set_parent ($self); 1198 $child->set_parent ($self);
922 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
923 1200
924 $child->check_size; 1201 $self->realloc;
925} 1202}
926 1203
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
931# 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?
932sub clear { 1205sub clear {
933 my ($self) = @_; 1206 my ($self) = @_;
934 1207
935 my @children = $self->children; 1208 my @children = $self->children;
936 delete $self->{children}; 1209 delete $self->{children};
… …
938 for (@children) { 1211 for (@children) {
939 delete $_->{parent}; 1212 delete $_->{parent};
940 $_->hide; 1213 $_->hide;
941 } 1214 }
942 1215
943 $self->update; 1216 $self->realloc;
944} 1217}
945 1218
946sub get_wh { 1219sub get_wh {
947 my ($self) = @_; 1220 my ($self) = @_;
948 1221
… …
979sub size_allocate { 1252sub size_allocate {
980 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
981 1254
982 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
983 1256
984 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
985 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
986 1259
987 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
988 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
989 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
990 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1044 } 1317 }
1045} 1318}
1046 1319
1047############################################################################# 1320#############################################################################
1048 1321
1049package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1050
1051# TODO: wrap into common Box base class
1052 1323
1053our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1054 1325
1055sub size_request { 1326sub size_request {
1056 my ($self) = @_; 1327 my ($self) = @_;
1057 1328
1058 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1059 1330 ? (
1060 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1061 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1062 (List::Util::max map $_->[1], @alloc), 1333 )
1063 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1064} 1338}
1065 1339
1066sub size_allocate { 1340sub size_allocate {
1067 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1068 1342
1069 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1070
1071 my $children = $self->{children}; 1344 my $children = $self->{children};
1072 1345
1073 my @h = map $_->{req_w}, @$children; 1346 my @req;
1074 1347
1075 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1076 1349 @req = ($space / (@$children || 1)) x @$children;
1077 if ($req_h > $h) {
1078 # ah well, not enough space
1079 $_ *= $h / $req_h for @h;
1080 } 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 {
1081 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1082 $exp ||= 1;
1083 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1084 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1085 my $child = $children->[$_];
1086
1087 my $alloc_h = $h[$_];
1088 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1089 $h[$_] = $alloc_h;
1090 } 1364 }
1091 } 1365 }
1092 1366
1093 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1094 1368
1095 my $y = 0; 1369 my $pos = 0;
1096 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1097 my $child = $children->[$_];
1098 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1099 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1100 1373
1101 $y += $h; 1374 $pos += $alloc;
1102 } 1375 }
1103 1376
1104 1 1377 1
1105} 1378}
1106 1379
1107############################################################################# 1380#############################################################################
1108 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
1109package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1110 1398
1111# TODO: wrap into common Box base class
1112
1113our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1114 1400
1115sub size_request { 1401sub new {
1116 my ($self) = @_; 1402 my $class = shift;
1117 1403
1118 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1119 1405 vertical => 1,
1120 ( 1406 @_,
1121 (List::Util::max map $_->[0], @alloc),
1122 (List::Util::sum map $_->[1], @alloc),
1123 ) 1407 )
1124} 1408}
1125 1409
1126sub size_allocate {
1127 my ($self, $w, $h) = @_;
1128
1129 my $children = $self->{children};
1130
1131 my @h = map $_->{req_h}, @$children;
1132
1133 my $req_h = List::Util::sum @h;
1134
1135 if ($req_h > $h) {
1136 # ah well, not enough space
1137 $_ *= $h / $req_h for @h;
1138 } else {
1139 my $exp = List::Util::sum map $_->{expand}, @$children;
1140 $exp ||= 1;
1141
1142 for (0 .. $#$children) {
1143 my $child = $children->[$_];
1144
1145 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1146 }
1147 }
1148
1149 CFClient::UI::harmonize \@h;
1150
1151 my $y = 0;
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154 my $h = $h[$_];
1155 $child->configure (0, $y, $w, $h);
1156
1157 $y += $h;
1158 }
1159
1160 1
1161}
1162
1163############################################################################# 1410#############################################################################
1164 1411
1165package CFClient::UI::Label; 1412package CFClient::UI::Label;
1166 1413
1167our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1168 1415
1169use CFClient::OpenGL; 1416use CFClient::OpenGL;
1170 1417
1171sub new { 1418sub new {
1172 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1173 1420
1174 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1176 #font => default_font 1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1177 fontsize => 1, 1431 fontsize => 1,
1178 text => "",
1179 align => -1, 1432 align => -1,
1180 valign => -1, 1433 valign => -1,
1181 padding => 2, 1434 padding_x => 2,
1182 layout => new CFClient::Layout, 1435 padding_y => 2,
1183 can_events => 0, 1436 can_events => 0,
1184 %arg 1437 %arg
1185 ); 1438 );
1186 1439
1187 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1443 $self->{template} = $layout;
1191 } 1444 }
1192 1445
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1195 1451
1196 $self 1452 $self
1197} 1453}
1198 1454
1199sub escape { 1455sub escape($) {
1200 local $_ = $_[1]; 1456 local $_ = $_[0];
1201 1457
1202 s/&/&amp;/g; 1458 s/&/&amp;/g;
1203 s/>/&gt;/g; 1459 s/>/&gt;/g;
1204 s/</&lt;/g; 1460 s/</&lt;/g;
1205 1461
1206 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1207} 1470}
1208 1471
1209sub set_text { 1472sub set_text {
1210 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1211 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1213 1480
1214 delete $self->{texture}; 1481 $self->realloc;
1215 $self->check_size;
1216 $self->update; 1482 $self->update;
1217} 1483}
1218 1484
1219sub set_markup { 1485sub set_markup {
1220 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1221 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1223 1495
1224 delete $self->{texture}; 1496 $self->realloc;
1225 $self->check_size;
1226 $self->update; 1497 $self->update;
1227} 1498}
1228 1499
1229sub size_request { 1500sub size_request {
1230 my ($self) = @_; 1501 my ($self) = @_;
1231 1502
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1508
1236 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1237 1510
1238 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1243 1516
1244 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1245 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1246 } 1519 }
1247 1520
1248 ( 1521 ($w, $h)
1249 $w + $self->{padding} * 2,
1250 $h + $self->{padding} * 2,
1251 )
1252} 1522}
1253 1523
1254sub size_allocate { 1524sub size_allocate {
1255 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1256 1526
… …
1260sub set_fontsize { 1530sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1262 1532
1263 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1534 delete $self->{texture};
1265 $self->check_size; 1535
1266 $self->update; 1536 $self->realloc;
1267} 1537}
1268 1538
1269sub _draw { 1539sub _draw {
1270 my ($self) = @_; 1540 my ($self) = @_;
1271 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1272 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1276 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1277 }; 1563 };
1278 1564
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1567
1568 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $tex->draw_quad ($self->{ox}, $self->{oy}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1299 1574
1300 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1576}
1303 1577
1304############################################################################# 1578#############################################################################
1305 1579
1306package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1319 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1320 can_hover => 1, 1594 can_hover => 1,
1321 can_focus => 1, 1595 can_focus => 1,
1322 valign => 0, 1596 valign => 0,
1323 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1324 @_ 1599 @_
1325 ) 1600 )
1326} 1601}
1327 1602
1328sub _set_text { 1603sub _set_text {
… …
1338 $self->{text} = $text; 1613 $self->{text} = $text;
1339 1614
1340 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1342 1617
1343 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1344} 1628}
1345 1629
1346sub get_text { 1630sub get_text {
1347 $_[0]{text} 1631 $_[0]{text}
1348} 1632}
… …
1351 my ($self) = @_; 1635 my ($self) = @_;
1352 1636
1353 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1354 1638
1355 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362}
1363
1364sub set_text {
1365 my ($self, $text) = @_;
1366
1367 $self->{cursor} = length $text;
1368 $self->_set_text ($text);
1369 $self->update;
1370} 1640}
1371 1641
1372sub key_down { 1642sub key_down {
1373 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1374 1644
… …
1376 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1378 1648
1379 my $text = $self->get_text; 1649 my $text = $self->get_text;
1380 1650
1381 if ($sym == 8) { 1651 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1664 $self->_emit ('escape');
1395 } elsif ($uni) { 1665 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1667 }
1398 1668
1399 $self->_set_text ($text); 1669 $self->_set_text ($text);
1400 $self->update; 1670
1671 $self->realloc;
1401} 1672}
1402 1673
1403sub focus_in { 1674sub focus_in {
1404 my ($self) = @_; 1675 my ($self) = @_;
1405 1676
… …
1485 if ($sym == 13) { 1756 if ($sym == 13) {
1486 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1487 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1490 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1491 $self->update; 1762 $self->update;
1492 1763
1493 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1532 1803
1533sub new { 1804sub new {
1534 my $class = shift; 1805 my $class = shift;
1535 1806
1536 $class->SUPER::new ( 1807 $class->SUPER::new (
1537 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1538 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1541 can_hover => 1, 1812 can_hover => 1,
1542 align => 0, 1813 align => 0,
1543 valign => 0, 1814 valign => 0,
1544 can_events => 1, 1815 can_events => 1,
1545 @_ 1816 @_
1546 ) 1817 )
1547} 1818}
1548 1819
1820sub activate { }
1821
1549sub button_up { 1822sub button_up {
1550 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1551 1824
1825 $self->emit ("activate")
1552 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1553 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1554 $self->emit ("activate");
1555 }
1556} 1828}
1557 1829
1558sub _draw { 1830sub _draw {
1559 my ($self) = @_; 1831 my ($self) = @_;
1560 1832
… …
1562 1834
1563 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1565 } 1837 }
1566 1838
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1572 1842
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1844
1575 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1846
1578 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1579} 1848}
1580 1849
1581############################################################################# 1850#############################################################################
… …
1592 1861
1593sub new { 1862sub new {
1594 my $class = shift; 1863 my $class = shift;
1595 1864
1596 $class->SUPER::new ( 1865 $class->SUPER::new (
1597 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1598 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1599 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1600 state => 0, 1872 state => 0,
1601 can_hover => 1, 1873 can_hover => 1,
1602 @_ 1874 @_
1603 ) 1875 )
1604} 1876}
1605 1877
1606sub size_request { 1878sub size_request {
1607 my ($self) = @_; 1879 my ($self) = @_;
1608 1880
1609 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1610} 1882}
1611 1883
1612sub button_down { 1884sub button_down {
1613 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1614 1886
1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1617 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1618 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1619 } 1891 }
1620} 1892}
1621 1893
1622sub _draw { 1894sub _draw {
1623 my ($self) = @_; 1895 my ($self) = @_;
1624 1896
1625 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1626 1898
1627 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1628 1900
1629 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;
1630 1904
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1906
1633 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1634 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1912}
1644 1913
1645############################################################################# 1914#############################################################################
1646 1915
1647package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1691 1960
1692 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1693 } 1962 }
1694 1963
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1966
1700 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1968
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1704} 1970}
1705 1971
1706############################################################################# 1972#############################################################################
1707 1973
… …
1755} 2021}
1756 2022
1757sub set_max { 2023sub set_max {
1758 my ($self, $max) = @_; 2024 my ($self, $max) = @_;
1759 2025
2026 return if $self->{max_val} == $max;
2027
1760 $self->{max_val} = $max; 2028 $self->{max_val} = $max;
2029 $self->update;
1761} 2030}
1762 2031
1763sub set_value { 2032sub set_value {
1764 my ($self, $val, $max) = @_; 2033 my ($self, $val, $max) = @_;
1765 2034
1766 $self->set_max ($max) 2035 $self->set_max ($max)
1767 if defined $max; 2036 if defined $max;
1768 2037
1769 $max = $self->{max_val}; 2038 return if $self->{val} == $val;
2039
1770 $self->{val} = $val; 2040 $self->{val} = $val;
1771
1772 $self->update; 2041 $self->update;
1773} 2042}
1774 2043
1775sub _draw { 2044sub _draw {
1776 my ($self) = @_; 2045 my ($self) = @_;
… …
1859 2128
1860 $self->{value}->set_fontsize ($fsize); 2129 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2130 $self->{max} ->set_fontsize ($fsize);
1862} 2131}
1863 2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
1864sub set_value { 2140sub set_value {
1865 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1866 2142
1867 $self->set_max ($max) 2143 $self->set_max ($max)
1868 if defined $max; 2144 if defined $max;
1869 2145
1870 $self->{gauge}->set_value ($val, $max); 2146 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2147 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2148}
1880 2149
1881############################################################################# 2150#############################################################################
1882 2151
1883package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1894 2163
1895sub new { 2164sub new {
1896 my $class = shift; 2165 my $class = shift;
1897 2166
1898 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1899 2168
1900 # TODO: 0-width page 2169 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2171 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
1906 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1907 req_w => 20, 2178 min_w => $::WIDTH / 80,
1908 req_h => 20, 2179 min_h => $::WIDTH / 80,
1909 vertical => 0, 2180 vertical => 0,
1910 can_hover => 1, 2181 can_hover => 1,
1911 inner_pad => 5, 2182 inner_pad => 0.02,
1912 @_ 2183 @_
1913 ); 2184 );
1914 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1915 $self 2189 $self
1916} 2190}
1917 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
1918sub size_request { 2226sub size_request {
1919 my ($self) = @_; 2227 my ($self) = @_;
1920 2228
1921 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1922 my $h = $self->{req_h};
1923
1924 $self->{vertical} ? ($h, $w) : ($w, $h)
1925} 2230}
1926 2231
1927sub button_down { 2232sub button_down {
1928 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1929 2234
1930 $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
1931 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1932} 2240}
1933 2241
1934sub mouse_motion { 2242sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1936 2244
1937 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1939 2264
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941 2266
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944 2269
1945 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2272
1951 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1952 $self->update; 2274 $self->{knob_w} = $knob_w;
1953 } 2275 });
1954}
1955 2276
1956# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962} 2278}
1963 2279
1964sub _draw { 2280sub _draw {
1965 my ($self) = @_; 2281 my ($self) = @_;
1966 2282
1967 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1968 2284
1969 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1970 2286
1971 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1973 2289
2290 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2292 }
1979 2293
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2296
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2299
2006 # draw background 2300 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2302
2009 # draw handle 2303 # draw handle
2010 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2011 2305
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2014} 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 (@_) }
2015 2349
2016############################################################################# 2350#############################################################################
2017 2351
2018package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2019 2353
… …
2028 fontsize => 1, 2362 fontsize => 1,
2029 can_events => 0, 2363 can_events => 0,
2030 #font => default_font 2364 #font => default_font
2031 @_, 2365 @_,
2032 2366
2033 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2034 par => [], 2368 par => [],
2035 height => 0, 2369 height => 0,
2036 children => [ 2370 children => [
2037 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
2039 ], 2373 ],
2040 ); 2374 );
2041 2375
2042 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2377
2046 $self 2378 $self
2047} 2379}
2048 2380
2049sub set_fontsize { 2381sub set_fontsize {
2050 my ($self, $fontsize) = @_; 2382 my ($self, $fontsize) = @_;
2051 2383
2052 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2385 $self->reflow;
2054}
2055
2056sub text_height {
2057 my ($self, $text) = @_;
2058
2059 my $layout = $self->{layout};
2060
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w});
2063 $layout->set_text ($text);
2064
2065 ($layout->size)[1]
2066}
2067
2068sub reflow {
2069 my ($self) = @_;
2070
2071 $self->{need_reflow}++;
2072 $self->update;
2073} 2386}
2074 2387
2075sub size_allocate { 2388sub size_allocate {
2076 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2077 2390
… …
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2396
2084 $self->reflow; 2397 $self->reflow;
2085} 2398}
2086 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2087sub add_paragraph { 2434sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2089 2436
2090 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2091 2438 my ($w, $h) = $self->text_size ($line);
2092 my $height = $self->text_height ($text);
2093
2094 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2095 2442
2096 push @{$self->{par}}, [$height, $color, $text];
2097
2098 $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]);
2099 $self->{children}[1]->update;
2100} 2444}
2101 2445
2102sub update { 2446sub update {
2103 my ($self) = @_; 2447 my ($self) = @_;
2104 2448
… …
2106 2450
2107 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2108 2452
2109 delete $self->{texture}; 2453 delete $self->{texture};
2110 2454
2111 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2112 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2459 my $height = 0;
2114 2460
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2116 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 }
2117 2476
2118 $self->{height} = $height; 2477 $self->{height} = $height;
2119 2478
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121 2480
2122 delete $self->{texture}; 2481 delete $self->{texture};
2123 } 2482 }
2124 2483
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2128 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2129 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134 my $top = int $self->{children}[1]{range}[0];
2135
2136 my $y0 = $top;
2137 my $y1 = $top + $self->{h};
2138
2139 my $y = 0;
2140
2141 my $layout = $self->{layout};
2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144 2502
2145 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2504 my $h = $par->[1];
2147 2505
2148 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2149 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2150 2510
2151 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2512
2153 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2154 } 2515 }
2155 2516
2156 $y += $h; 2517 $y += $h;
2157 } 2518 }
2158 2519
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2161 }; 2521 };
2162 }); 2522 });
2163} 2523}
2164 2524
2165sub _draw { 2525sub _draw {
2166 my ($self) = @_; 2526 my ($self) = @_;
2167 2527
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2174 }
2175 2533
2176 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2177 2535
2178} 2536}
2179 2537
… …
2227 2585
2228sub new { 2586sub new {
2229 my $class = shift; 2587 my $class = shift;
2230 2588
2231 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2232 state => 0, 2590 state => 0,
2233 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2234 @_ 2592 @_
2235 ); 2593 );
2236 2594
2237 if ($self->{state}) {
2238 $self->{state} = 0;
2239 $self->toggle_flopper;
2240 }
2241
2242 $self 2595 $self
2243} 2596}
2244 2597
2245sub toggle_flopper { 2598sub toggle_flopper {
2246 my ($self) = @_; 2599 my ($self) = @_;
2247 2600
2248 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2249 if ($self->{state} = !$self->{state}) {
2250 $CFClient::UI::ROOT->add ($self->{other});
2251 $self->{other}->move ($self->coord2global (0, $self->{h}));
2252 $self->emit ("open");
2253 } else {
2254 $CFClient::UI::ROOT->remove ($self->{other});
2255 $self->emit ("close");
2256 }
2257
2258 $self->emit (changed => $self->{state});
2259} 2602}
2260 2603
2261############################################################################# 2604#############################################################################
2262 2605
2263package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2273 @_, 2616 @_,
2274 can_events => 0, 2617 can_events => 0,
2275 ) 2618 )
2276} 2619}
2277 2620
2278sub set_markup { 2621sub set_tooltip_from {
2279 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2280 2623
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2282 $self->{label}->set_markup ($text); 2625
2283 $self->add ($self->{label}); 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
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2284} 2641}
2285 2642
2286sub size_request { 2643sub size_request {
2287 my ($self) = @_; 2644 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2645
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2647
2293 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2294} 2649}
… …
2297 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2298 2653
2299 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300} 2655}
2301 2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2302sub _draw { 2675sub _draw {
2303 my ($self) = @_; 2676 my ($self) = @_;
2304 2677
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2307 2679
2308 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2309 2681
2310 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2693 glVertex 0 , $h;
2322 glVertex $w, $h; 2694 glVertex $w, $h;
2323 glVertex $w, 0; 2695 glVertex $w, 0;
2324 glEnd; 2696 glEnd;
2325 2697
2326 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2327 2699
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2330} 2701}
2331 2702
2332############################################################################# 2703#############################################################################
2333 2704
… …
2338use CFClient::OpenGL; 2709use CFClient::OpenGL;
2339 2710
2340sub new { 2711sub new {
2341 my $class = shift; 2712 my $class = shift;
2342 2713
2343 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2344 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2345 @_, 2717 @_,
2346 ) 2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2347} 2735}
2348 2736
2349sub size_request { 2737sub size_request {
2350 (32, 8) 2738 (32, 8)
2351} 2739}
2352 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2353sub draw { 2749sub _draw {
2354 my ($self) = @_; 2750 my ($self) = @_;
2355 2751
2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2764
2358 if ($tex) { 2765 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2368} 2781}
2369 2782
2370############################################################################# 2783#############################################################################
2371 2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
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});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2992 }
2993
2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
2372package CFClient::UI::Root; 3009package CFClient::UI::Root;
2373 3010
2374our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2375 3012
2376use CFClient::OpenGL; 3013use CFClient::OpenGL;
2377 3014
2378sub check_size { 3015sub new {
2379 my ($self) = @_; 3016 my $class = shift;
2380 3017
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2382} 3026}
2383 3027
2384sub size_request { 3028sub size_request {
2385 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2386}
2387 3030
2388sub configure { 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
3046}
3047
3048sub size_allocate {
2389 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2390 3050
2391 $self->SUPER::configure ($x, $y, $w, $h);
2392
2393 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2394 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)};
2395 3053
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
2398 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2399 } 3061 }
2400} 3062}
2401 3063
2402sub _topleft { 3064sub coord2local {
2403 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2404 3066
2405 ($x, $y) 3067 ($x, $y)
2406} 3068}
2407 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2408sub update { 3076sub update {
2409 my ($self) = @_; 3077 my ($self) = @_;
2410 3078
2411 $self->check_size; 3079 $::WANT_REFRESH++;
2412 ::refresh ();
2413} 3080}
2414 3081
2415sub add { 3082sub add {
2416 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2417 3084
2418 # integerize window positions 3085 $_->{is_toplevel} = 1
2419 $child->{x} = int $child->{x}; 3086 for @children;
2420 $child->{y} = int $child->{y};
2421 3087
2422 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2423} 3104}
2424 3105
2425sub on_refresh { 3106sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2427 3108
2428 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2429} 3110}
2430 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2431sub draw { 3118sub draw {
2432 my ($self) = @_; 3119 my ($self) = @_;
2433 3120
2434 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2436 } 3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
2437 3199
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2441 3203
2442 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3205 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3208 glLoadIdentity;
2447 3209
2448 $self->_draw; 3210 $self->_draw;
2449} 3211}
2450 3212
2451############################################################################# 3213#############################################################################
2452 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 $vb->add (my $hb = new CFClient::UI::HBox);
3227 $hb->add (new CFClient::UI::Label text => "Key: ");
3228 $hb->add ($self->{keylbl} = new CFClient::UI::Label);
3229 $hb->add (new CFClient::UI::Button
3230 text => "bind",
3231 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3232 on_activate => sub {
3233 $self->ask_for_bind;
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3238 text => "start recording",
3239 tooltip => "Start/Stops recording of actions."
3240 ."All subsequent actions after the recording started will be captured."
3241 ."The actions are displayed after the record was stopped."
3242 ."To bind the action you have to click on the 'Bind' button",
3243 on_activate => sub {
3244 unless ($self->{recording}) {
3245 $self->start;
3246 } else {
3247 $self->stop;
3248 }
3249 });
3250
3251 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3252
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add (new CFClient::UI::Button
3255 text => "ok",
3256 tooltip => "This closes the binding editor and saves the binding",
3257 on_activate => sub {
3258 $self->hide;
3259 $self->commit;
3260 });
3261
3262 $hb->add (new CFClient::UI::Button
3263 text => "cancel",
3264 tooltip => "This closes the binding editor without saving",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->{binding_cancel}->()
3268 if $self->{binding_cancel};
3269 });
3270
3271 $self->update_binding_widgets;
3272
3273 $self
3274}
3275
3276sub commit {
3277 my ($self) = @_;
3278 my ($mod, $sym, $cmds) = $self->get_binding;
3279 if ($sym != 0 && @$cmds > 0) {
3280 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3281 ."'. Don't forget 'Save Config'!");
3282 $self->{binding_change}->($mod, $sym, $cmds)
3283 if $self->{binding_change};
3284 } else {
3285 $::STATUSBOX->add ("No action bound, no keys specified!");
3286 $self->{binding_cancel}->()
3287 if $self->{binding_cancel};
3288 }
3289}
3290
3291sub start {
3292 my ($self) = @_;
3293
3294 $self->{rec_btn}->set_text ("stop recording");
3295 $self->{recording} = 1;
3296 $self->clear_command_list;
3297 $::CONN->start_record if $::CONN;
3298}
3299
3300sub stop {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("start recording");
3304 $self->{recording} = 0;
3305
3306 my $rec;
3307 $rec = $::CONN->stop_record if $::CONN;
3308 return unless ref $rec eq 'ARRAY';
3309 $self->set_command_list ($rec);
3310}
3311
3312sub ask_for_bind {
3313 my ($self, $commit) = @_;
3314
3315 CFClient::Binder::open_binding_dialog (sub {
3316 my ($mod, $sym) = @_;
3317 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3318 $self->update_binding_widgets;
3319 $self->commit if $commit;
3320 });
3321}
3322
3323sub set_binding {
3324 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3325
3326 $self->clear_command_list;
3327 $self->{recording} = 0;
3328 $self->{rec_btn}->set_text ("start recording");
3329
3330 $self->{binding} = [$mod, $sym];
3331 $self->{commands} = $cmds;
3332
3333 $self->{binding_change} = $cb;
3334 $self->{binding_cancel} = $ccb;
3335
3336 $self->update_binding_widgets;
3337}
3338
3339sub update_binding_widgets {
3340 my ($self) = @_;
3341 my ($mod, $sym, $cmds) = $self->get_binding;
3342 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3343 $self->set_command_list ($cmds);
3344}
3345
3346sub get_binding {
3347 my ($self) = @_;
3348 return (
3349 $self->{binding}->[0],
3350 $self->{binding}->[1],
3351 [ grep { defined $_ } @{$self->{commands}} ]
3352 );
3353}
3354
3355sub clear_command_list {
3356 my ($self) = @_;
3357 $self->{cmdbox}->clear ();
3358}
3359
3360sub set_command_list {
3361 my ($self, $cmds) = @_;
3362
3363 $self->{cmdbox}->clear ();
3364 $self->{commands} = $cmds;
3365
3366 my $idx = 0;
3367
3368 for (@$cmds) {
3369 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3370
3371 my $i = $idx;
3372 $hb->add (new CFClient::UI::Button
3373 text => "delete",
3374 tooltip => "Deletes the action from the record",
3375 on_activate => sub {
3376 $self->{cmdbox}->remove ($hb);
3377 $cmds->[$i] = undef;
3378 });
3379
3380 $hb->add (new CFClient::UI::Label text => $_);
3381
3382 $idx++
3383 }
3384}
3385
3386
3387#############################################################################
3388
2453package CFClient::UI; 3389package CFClient::UI;
2454 3390
2455$ROOT = new CFClient::UI::Root; 3391$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3392$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3393
24581 33941
2459 3395

Diff Legend

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