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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.261 by elmex, Tue May 30 14:45:56 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
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 60 }
40 61
41 return; 62 return;
42 } 63 }
43 } 64 }
… …
47 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
48} 69}
49 70
50# class methods for events 71# class methods for events
51sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 74 if $FOCUS;
54} 75}
55 76
56sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 79 if $FOCUS;
59} 80}
60 81
61sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
62 my ($ev) = @_; 83 my ($ev) = @_;
… …
71 check_tooltip; 92 check_tooltip;
72 } 93 }
73 94
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 96
76 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 99}
81 100
82sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
83 my ($ev) = @_; 102 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
85 104
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 106
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 108
90 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 111
95 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 114 $grab->update if $grab;
98 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 132
116 check_tooltip; 133 check_tooltip;
117 } 134 }
118 135
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 137 if $HOVER;
123} 138}
124 139
125# convert position array to integers 140# convert position array to integers
126sub harmonize { 141sub harmonize {
127 my ($vals) = @_; 142 my ($vals) = @_;
… …
133 $rem += $_ - $i; 148 $rem += $_ - $i;
134 $_ = $i; 149 $_ = $i;
135 } 150 }
136} 151}
137 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
138############################################################################# 194#############################################################################
139 195
140package CFClient::UI::Base; 196package CFClient::UI::Base;
141 197
142use strict; 198use strict;
… …
145 201
146sub new { 202sub new {
147 my $class = shift; 203 my $class = shift;
148 204
149 my $self = bless { 205 my $self = bless {
150 x => 0, 206 x => "center",
151 y => 0, 207 y => "center",
152 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
153 can_events => 1, 211 can_events => 1,
154 @_ 212 @_
155 }, $class; 213 }, $class;
156 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
157 for (keys %$self) { 217 for (keys %$self) {
158 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
160 } 220 }
161 } 221 }
162 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
163 $self 235 $self
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
… …
176 return if $self->{parent}; 248 return if $self->{parent};
177 249
178 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
179} 251}
180 252
181sub hide { 253sub set_visible {
182 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
183 277
184 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
186 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
187 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
188 if $self->{parent}; 312 if $self->{parent};
189} 313}
190 314
191sub move { 315sub move_abs {
192 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
193 317
194 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
197 321
198 $self->update; 322 $self->update;
199} 323}
200 324
201sub set_size { 325sub set_size {
202 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
203 327
204 $self->{user_w} = $w; 328 $self->{force_w} = $w;
205 $self->{user_h} = $h; 329 $self->{force_h} = $h;
206 330
207 $self->check_size; 331 $self->realloc;
208} 332}
209 333
210sub size_request { 334sub size_request {
211 require Carp; 335 require Carp;
212 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
214 338
215sub configure { 339sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
217 341
218 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
221 347
222 # use alignment to adjust x, y 348 # use alignment to adjust x, y
223 349
224 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 352 }
229 353
230 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 355 $self->{x} = $x;
232 $self->{y} = $y; 356 $self->{y} = $y;
233 $self->update; 357 $self->update;
234 } 358 }
235 359
236 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
237 $self->{w} = $w; 363 $self->{alloc_w} = $w;
238 $self->{h} = $h; 364 $self->{alloc_h} = $h;
239 365
240 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 } 367 }
243} 368}
244 369
245sub size_allocate { 370sub size_allocate {
246 # nothing to be done 371 # nothing to be done
247} 372}
248 373
249sub children { 374sub children {
250} 375}
251 376
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size { 377sub set_max_size {
263 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
264 379
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 382}
268 383
269# return top left coordinates 384sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
272 386
273 $self->{parent} 387 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
275 389
276 $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 }
277} 398}
278 399
279# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
280sub coord2local { 401sub coord2local {
281 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
282 403
283 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 405}
286 406
287# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
288sub coord2global { 408sub coord2global {
289 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
290 410
291 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 412}
294 413
295sub focus_in { 414sub focus_in {
296 my ($self) = @_; 415 my ($self) = @_;
297 416
298 return if $FOCUS == $self; 417 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
300 419
301 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
302 421
303 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
304 423
305 $focus->update if $focus; 424 $focus->update if $focus;
306 $FOCUS->update; 425 $FOCUS->update;
307} 426}
308 427
… …
311 430
312 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
313 432
314 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
315 434
316 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
317 436
318 $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;
319} 441}
320 442
321sub mouse_motion { } 443sub mouse_motion { }
322sub button_up { } 444sub button_up { }
323sub key_down { } 445sub key_down { }
324sub key_up { } 446sub key_up { }
325 447
326sub button_down { 448sub button_down {
327 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
328 450
329 $self->focus_in; 451 $self->focus_in;
… …
332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
336sub 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}
337 529
338sub draw { 530sub draw {
339 my ($self) = @_; 531 my ($self) = @_;
340 532
341 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
358 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
359 glEnd; 551 glEnd;
360 glDisable GL_BLEND; 552 glDisable GL_BLEND;
361 } 553 }
362 554
363 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
364 glPushMatrix; 556 glPushMatrix;
365 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 560 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
372 glEnd; 564 glEnd;
373 glPopMatrix; 565 glPopMatrix;
374 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;
375 } 567 }
376} 568}
377 569
378sub _draw { 570sub _draw {
379 my ($self) = @_; 571 my ($self) = @_;
380 572
381 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
382} 574}
383 575
384sub find_widget {
385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
388
389 return $self
390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393 ()
394}
395
396sub set_parent {
397 my ($self, $parent) = @_;
398
399 Scalar::Util::weaken ($self->{parent} = $parent);
400}
401
402sub check_size {
403 my ($self) = @_;
404
405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426}
427
428sub update {
429 my ($self) = @_;
430
431 $self->{parent}->update
432 if $self->{parent};
433}
434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
447sub DESTROY { 576sub DESTROY {
448 my ($self) = @_; 577 my ($self) = @_;
449 578
579 delete $WIDGET{$self+0};
450 #$self->deactivate; 580 #$self->deactivate;
451} 581}
452 582
453############################################################################# 583#############################################################################
454 584
… …
463 my $class = shift; 593 my $class = shift;
464 594
465 # range [value, low, high, page] 595 # range [value, low, high, page]
466 596
467 $class->SUPER::new ( 597 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
470 @_ 600 @_
471 ) 601 )
472} 602}
473 603
474sub _draw { 604sub _draw {
475 my ($self) = @_; 605 my ($self) = @_;
476 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
478 613
479 glEnable GL_BLEND; 614 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
482 617
483 glBegin GL_QUADS; 618 glBegin GL_QUADS;
484 glVertex 0 , 0; 619 glVertex 0 , 0;
485 glVertex 0 , $h; 620 glVertex 0 , $h;
486 glVertex $w, $h; 621 glVertex $w, $h;
487 glVertex $w, 0; 622 glVertex $w, 0;
488 glEnd; 623 glEnd;
489 624
490 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
491} 627}
492 628
493############################################################################# 629#############################################################################
494 630
495package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
500 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
502} 638}
503 639
504sub size_request { 640sub size_request {
505 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
506} 644}
507 645
508sub draw { } 646sub draw { }
509 647
510############################################################################# 648#############################################################################
… …
527 665
528 $self 666 $self
529} 667}
530 668
531sub add { 669sub add {
532 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
533 671
534 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
535 674
536 use sort 'stable'; 675 use sort 'stable';
537 676
538 $self->{children} = [ 677 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
541 ]; 680 ];
542 681
543 $child->check_size; 682 $self->realloc;
544} 683}
545 684
546sub children { 685sub children {
547 @{ $_[0]{children} } 686 @{ $_[0]{children} }
548} 687}
… …
553 delete $child->{parent}; 692 delete $child->{parent};
554 $child->hide; 693 $child->hide;
555 694
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 696
558 $self->check_size; 697 $self->realloc;
559 $self->update;
560} 698}
561 699
562sub clear { 700sub clear {
563 my ($self) = @_; 701 my ($self) = @_;
564 702
… …
567 705
568 for (@$children) { 706 for (@$children) {
569 delete $_->{parent}; 707 delete $_->{parent};
570 $_->hide; 708 $_->hide;
571 } 709 }
710
711 $self->realloc;
572} 712}
573 713
574sub find_widget { 714sub find_widget {
575 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
576 716
… …
651} 791}
652 792
653sub update { 793sub update {
654 my ($self) = @_; 794 my ($self) = @_;
655 795
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 797 $self->SUPER::update;
658} 798}
659 799
660sub size_allocate { 800sub size_allocate {
661 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
662 802
663 $self->SUPER::size_allocate ($w, $h); 803 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 804 $self->update;
805}
806
807sub _render {
808 $_[0]{children}[0]->draw;
665} 809}
666 810
667sub render_child { 811sub render_child {
668 my ($self) = @_; 812 my ($self) = @_;
669 813
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 817
674# glColorMask 1, 1, 1, 0; 818 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 819 };
682} 820}
683 821
684sub _draw { 822sub _draw {
685 my ($self) = @_; 823 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
688 826
689 my $tex = $self->{texture} 827 my $tex = $self->{texture}
690 or return; 828 or return;
691 829
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
697 833
698 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 835
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
702} 837}
703 838
704############################################################################# 839#############################################################################
705 840
706package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
707 842
708our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 844
736sub new { 845sub new {
737 my $class = shift; 846 my $class = shift;
738 847
739 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
740 bg => [1, 1, 1, 1], 849 scroll_x => 0,
741 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
742 border => 0.8,
743 @_ 851 @_,
744 ); 852 )
745
746 $self
747} 853}
748 854
749sub _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 {
750 my ($self) = @_; 867 my ($self, $w, $h) = @_;
751 868
752 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
753 870
754 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 873
759# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
760# glColor 0, 0, 0, 0; 875 $self->update;
761# glVertex 0 , 0; 876}
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
767 880
768 $self->child->draw; 881 $self->{view_x} = int $x;
769 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
770 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;
771} 921}
772 922
773############################################################################# 923#############################################################################
774 924
775package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
776 926
777our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
778
779use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784 928
785sub new { 929sub new {
786 my $class = shift; 930 my $class = shift;
787 931
788 # 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;
789 1035
790 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1039 border => 0.6,
794 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
795 @_ 1043 @_
796 ); 1044 );
797 1045
798 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 1047 align => 0,
… …
823 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
824 1072
825 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
827 1075
828 $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)
829 if $self->{title}; 1077 if $self->{title};
830 1078
831 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
832} 1080}
833 1081
… …
852 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
853 1101
854 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
856 1104
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size;
861 }; 1110 };
862 1111
863 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1116 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
869 1118
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
871 1120
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update;
874 }; 1122 };
875 } 1123 }
876} 1124}
877 1125
878sub button_up { 1126sub button_up {
… …
891 my ($self) = @_; 1139 my ($self) = @_;
892 1140
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1143
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1146
901 my $border = $self->border; 1147 my $border = $self->border;
902 1148
903 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1154
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
911 1157
912 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
913 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
914 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
915
916 glColor @{ $self->{bg} };
917
918 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
922 1164
923 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1166
927 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
928 1168
929 $self->child->draw; 1169 $self->child->draw;
930} 1170}
… …
942sub new { 1182sub new {
943 my $class = shift; 1183 my $class = shift;
944 1184
945 $class->SUPER::new ( 1185 $class->SUPER::new (
946 col_expand => [], 1186 col_expand => [],
947 @_ 1187 @_,
948 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1193}
950 1194
951sub add { 1195sub add {
952 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
953 1197
954 $child->set_parent ($self); 1198 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
956 1200
957 $child->check_size; 1201 $self->realloc;
958} 1202}
959 1203
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# 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?
965sub clear { 1205sub clear {
966 my ($self) = @_; 1206 my ($self) = @_;
967 1207
968 my @children = $self->children; 1208 my @children = $self->children;
969 delete $self->{children}; 1209 delete $self->{children};
… …
971 for (@children) { 1211 for (@children) {
972 delete $_->{parent}; 1212 delete $_->{parent};
973 $_->hide; 1213 $_->hide;
974 } 1214 }
975 1215
976 $self->update; 1216 $self->realloc;
977} 1217}
978 1218
979sub get_wh { 1219sub get_wh {
980 my ($self) = @_; 1220 my ($self) = @_;
981 1221
… …
1012sub size_allocate { 1252sub size_allocate {
1013 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1014 1254
1015 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1016 1256
1017 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1019 1259
1020 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1317 }
1078} 1318}
1079 1319
1080############################################################################# 1320#############################################################################
1081 1321
1082package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1323
1086our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1087 1325
1088sub size_request { 1326sub size_request {
1089 my ($self) = @_; 1327 my ($self) = @_;
1090 1328
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1092 1330 ? (
1093 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1333 )
1096 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1097} 1338}
1098 1339
1099sub size_allocate { 1340sub size_allocate {
1100 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1101 1342
1102 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1344 my $children = $self->{children};
1105 1345
1106 my @h = map $_->{req_w}, @$children; 1346 my @req;
1107 1347
1108 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1109 1349 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } 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 {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1364 }
1124 } 1365 }
1125 1366
1126 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1127 1368
1128 my $y = 0; 1369 my $pos = 0;
1129 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1373
1134 $y += $h; 1374 $pos += $alloc;
1135 } 1375 }
1136 1376
1137 1 1377 1
1138} 1378}
1139 1379
1140############################################################################# 1380#############################################################################
1141 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
1142package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1143 1398
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1147 1400
1148sub size_request { 1401sub new {
1149 my ($self) = @_; 1402 my $class = shift;
1150 1403
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1152 1405 vertical => 1,
1153 ( 1406 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1407 )
1157} 1408}
1158 1409
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1410#############################################################################
1197 1411
1198package CFClient::UI::Label; 1412package CFClient::UI::Label;
1199 1413
1200our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1201 1415
1202use CFClient::OpenGL; 1416use CFClient::OpenGL;
1203 1417
1204sub new { 1418sub new {
1205 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1206 1420
1207 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1209 #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),
1210 fontsize => 1, 1431 fontsize => 1,
1211 text => "",
1212 align => -1, 1432 align => -1,
1213 valign => -1, 1433 valign => -1,
1214 padding => 2, 1434 padding_x => 2,
1215 layout => new CFClient::Layout, 1435 padding_y => 2,
1216 can_events => 0, 1436 can_events => 0,
1217 %arg 1437 %arg
1218 ); 1438 );
1219 1439
1220 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1443 $self->{template} = $layout;
1224 } 1444 }
1225 1445
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1227 $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 }
1228 1451
1229 $self 1452 $self
1230} 1453}
1231 1454
1232sub escape { 1455sub escape($) {
1233 local $_ = $_[1]; 1456 local $_ = $_[0];
1234 1457
1235 s/&/&amp;/g; 1458 s/&/&amp;/g;
1236 s/>/&gt;/g; 1459 s/>/&gt;/g;
1237 s/</&lt;/g; 1460 s/</&lt;/g;
1238 1461
1239 $_[1] 1462 $_
1240} 1463}
1241 1464
1242sub update { 1465sub update {
1243 my ($self) = @_; 1466 my ($self) = @_;
1244 1467
1245 delete $self->{texture}; 1468 delete $self->{texture};
1246 $self->SUPER::update; 1469 $self->SUPER::update;
1247} 1470}
1248 1471
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1472sub set_text {
1256 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1257 1474
1258 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1260 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1262 1480
1263 delete $self->{texture}; 1481 $self->realloc;
1264 $self->update; 1482 $self->update;
1265 $self->check_size;
1266} 1483}
1267 1484
1268sub set_markup { 1485sub set_markup {
1269 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1270 1487
1271 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1273 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1275 1495
1276 delete $self->{texture}; 1496 $self->realloc;
1277 $self->update; 1497 $self->update;
1278 $self->check_size;
1279} 1498}
1280 1499
1281sub size_request { 1500sub size_request {
1282 my ($self) = @_; 1501 my ($self) = @_;
1283 1502
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $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});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1508
1288 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1289 1510
1290 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1295 1516
1296 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1298 } 1519 }
1299 1520
1300 ( 1521 ($w, $h)
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1522}
1305 1523
1306sub size_allocate { 1524sub size_allocate {
1307 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1308 1526
… …
1312sub set_fontsize { 1530sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1314 1532
1315 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1534 delete $self->{texture};
1317 $self->check_size; 1535
1318 $self->update; 1536 $self->realloc;
1319} 1537}
1320 1538
1321sub _draw { 1539sub _draw {
1322 my ($self) = @_; 1540 my ($self) = @_;
1323 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1324 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $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});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1328 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
1329 }; 1563 };
1330 1564
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1567
1568 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $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 }
1351 1574
1352 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1576}
1355 1577
1356############################################################################# 1578#############################################################################
1357 1579
1358package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1372 can_hover => 1, 1594 can_hover => 1,
1373 can_focus => 1, 1595 can_focus => 1,
1374 valign => 0, 1596 valign => 0,
1375 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1376 @_ 1599 @_
1377 ) 1600 )
1378} 1601}
1379 1602
1380sub _set_text { 1603sub _set_text {
… …
1390 $self->{text} = $text; 1613 $self->{text} = $text;
1391 1614
1392 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1394 1617
1395 $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;
1396} 1628}
1397 1629
1398sub get_text { 1630sub get_text {
1399 $_[0]{text} 1631 $_[0]{text}
1400} 1632}
… …
1403 my ($self) = @_; 1635 my ($self) = @_;
1404 1636
1405 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1406 1638
1407 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1640}
1423 1641
1424sub key_down { 1642sub key_down {
1425 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1426 1644
… …
1428 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1430 1648
1431 my $text = $self->get_text; 1649 my $text = $self->get_text;
1432 1650
1433 if ($sym == 8) { 1651 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1664 $self->_emit ('escape');
1447 } elsif ($uni) { 1665 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1667 }
1450 1668
1451 $self->_set_text ($text); 1669 $self->_set_text ($text);
1452 $self->update; 1670
1671 $self->realloc;
1453} 1672}
1454 1673
1455sub focus_in { 1674sub focus_in {
1456 my ($self) = @_; 1675 my ($self) = @_;
1457 1676
… …
1537 if ($sym == 13) { 1756 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1543 $self->update; 1762 $self->update;
1544 1763
1545 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1584 1803
1585sub new { 1804sub new {
1586 my $class = shift; 1805 my $class = shift;
1587 1806
1588 $class->SUPER::new ( 1807 $class->SUPER::new (
1589 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1590 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1593 can_hover => 1, 1812 can_hover => 1,
1594 align => 0, 1813 align => 0,
1595 valign => 0, 1814 valign => 0,
1596 can_events => 1, 1815 can_events => 1,
1597 @_ 1816 @_
1598 ) 1817 )
1599} 1818}
1600 1819
1820sub activate { }
1821
1601sub button_up { 1822sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1603 1824
1825 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1828}
1609 1829
1610sub _draw { 1830sub _draw {
1611 my ($self) = @_; 1831 my ($self) = @_;
1612 1832
… …
1614 1834
1615 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1617 } 1837 }
1618 1838
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1624 1842
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1844
1627 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1846
1630 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1631} 1848}
1632 1849
1633############################################################################# 1850#############################################################################
… …
1644 1861
1645sub new { 1862sub new {
1646 my $class = shift; 1863 my $class = shift;
1647 1864
1648 $class->SUPER::new ( 1865 $class->SUPER::new (
1649 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1650 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1651 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],
1652 state => 0, 1872 state => 0,
1653 can_hover => 1, 1873 can_hover => 1,
1654 @_ 1874 @_
1655 ) 1875 )
1656} 1876}
1657 1877
1658sub size_request { 1878sub size_request {
1659 my ($self) = @_; 1879 my ($self) = @_;
1660 1880
1661 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1662} 1882}
1663 1883
1664sub button_down { 1884sub button_down {
1665 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1666 1886
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1669 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1671 } 1891 }
1672} 1892}
1673 1893
1674sub _draw { 1894sub _draw {
1675 my ($self) = @_; 1895 my ($self) = @_;
1676 1896
1677 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1678 1898
1679 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1680 1900
1681 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;
1682 1904
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1906
1685 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1686 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1912}
1696 1913
1697############################################################################# 1914#############################################################################
1698 1915
1699package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1743 1960
1744 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1745 } 1962 }
1746 1963
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1966
1752 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1968
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1756} 1970}
1757 1971
1758############################################################################# 1972#############################################################################
1759 1973
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1949 2163
1950sub new { 2164sub new {
1951 my $class = shift; 2165 my $class = shift;
1952 2166
1953 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1954 2168
1955 # TODO: 0-width page 2169 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2171 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1960 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],
1961 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2178 min_w => $::WIDTH / 80,
1963 req_h => 20, 2179 min_h => $::WIDTH / 80,
1964 vertical => 0, 2180 vertical => 0,
1965 can_hover => 1, 2181 can_hover => 1,
1966 inner_pad => 5, 2182 inner_pad => 0.02,
1967 @_ 2183 @_
1968 ); 2184 );
1969 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1970 $self 2189 $self
1971} 2190}
1972 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
1973sub size_request { 2226sub size_request {
1974 my ($self) = @_; 2227 my ($self) = @_;
1975 2228
1976 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2230}
1981 2231
1982sub button_down { 2232sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1984 2234
1985 $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
1986 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1987} 2240}
1988 2241
1989sub mouse_motion { 2242sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1991 2244
1992 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
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1994 2264
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2266
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2269
2000 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2272
2006 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2274 $self->{knob_w} = $knob_w;
2008 } 2275 });
2009}
2010 2276
2011# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2278}
2018 2279
2019sub _draw { 2280sub _draw {
2020 my ($self) = @_; 2281 my ($self) = @_;
2021 2282
2022 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
2023 2284
2024 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
2025 2286
2026 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2028 2289
2290 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2292 }
2034 2293
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2296
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2299
2061 # draw background 2300 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2302
2064 # draw handle 2303 # draw handle
2065 $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);
2066 2305
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2069} 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 (@_) }
2070 2349
2071############################################################################# 2350#############################################################################
2072 2351
2073package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2074 2353
… …
2083 fontsize => 1, 2362 fontsize => 1,
2084 can_events => 0, 2363 can_events => 0,
2085 #font => default_font 2364 #font => default_font
2086 @_, 2365 @_,
2087 2366
2088 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2089 par => [], 2368 par => [],
2090 height => 0, 2369 height => 0,
2091 children => [ 2370 children => [
2092 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
… …
2104 2383
2105 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2385 $self->reflow;
2107} 2386}
2108 2387
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2388sub size_allocate {
2129 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2130 2390
2131 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2132 2392
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2396
2137 $self->reflow; 2397 $self->reflow;
2138} 2398}
2139 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
2140sub add_paragraph { 2434sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2142 2436
2143 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2144 2438 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2148 2442
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $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]);
2152 $self->{children}[1]->update;
2153} 2444}
2154 2445
2155sub update { 2446sub update {
2156 my ($self) = @_; 2447 my ($self) = @_;
2157 2448
… …
2159 2450
2160 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2161 2452
2162 delete $self->{texture}; 2453 delete $self->{texture};
2163 2454
2164 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2165 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2459 my $height = 0;
2167 2460
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2169 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 }
2170 2476
2171 $self->{height} = $height; 2477 $self->{height} = $height;
2172 2478
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2480
2175 delete $self->{texture}; 2481 delete $self->{texture};
2176 } 2482 }
2177 2483
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2181 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
2182 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2502
2198 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2504 my $h = $par->[1];
2200 2505
2201 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]);
2202 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2203 2510
2204 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2512
2206 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;
2207 } 2515 }
2208 2516
2209 $y += $h; 2517 $y += $h;
2210 } 2518 }
2211 2519
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2214 }; 2521 };
2215 }); 2522 });
2216} 2523}
2217 2524
2218sub _draw { 2525sub _draw {
2219 my ($self) = @_; 2526 my ($self) = @_;
2220 2527
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2533
2230 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2231 2535
2232} 2536}
2233 2537
… …
2281 2585
2282sub new { 2586sub new {
2283 my $class = shift; 2587 my $class = shift;
2284 2588
2285 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2286 state => 0, 2590 state => 0,
2287 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2288 @_ 2592 @_
2289 ); 2593 );
2290 2594
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2595 $self
2297} 2596}
2298 2597
2299sub toggle_flopper { 2598sub toggle_flopper {
2300 my ($self) = @_; 2599 my ($self) = @_;
2301 2600
2302 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2602}
2314 2603
2315############################################################################# 2604#############################################################################
2316 2605
2317package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2327 @_, 2616 @_,
2328 can_events => 0, 2617 can_events => 0,
2329 ) 2618 )
2330} 2619}
2331 2620
2332sub set_markup { 2621sub set_tooltip_from {
2333 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2334 2623
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2336 $self->{label}->set_markup ($text); 2625
2337 $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 );
2338} 2641}
2339 2642
2340sub size_request { 2643sub size_request {
2341 my ($self) = @_; 2644 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2645
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2647
2347 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2348} 2649}
… …
2351 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2352 2653
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2354} 2655}
2355 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
2356sub _draw { 2675sub _draw {
2357 my ($self) = @_; 2676 my ($self) = @_;
2358 2677
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2361 2679
2362 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2363 2681
2364 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2693 glVertex 0 , $h;
2376 glVertex $w, $h; 2694 glVertex $w, $h;
2377 glVertex $w, 0; 2695 glVertex $w, 0;
2378 glEnd; 2696 glEnd;
2379 2697
2380 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2381 2699
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2384} 2701}
2385 2702
2386############################################################################# 2703#############################################################################
2387 2704
… …
2392use CFClient::OpenGL; 2709use CFClient::OpenGL;
2393 2710
2394sub new { 2711sub new {
2395 my $class = shift; 2712 my $class = shift;
2396 2713
2397 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2398 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2399 @_, 2717 @_,
2400 ) 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
2401} 2735}
2402 2736
2403sub size_request { 2737sub size_request {
2404 (32, 8) 2738 (32, 8)
2405} 2739}
2406 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2407sub _draw { 2749sub _draw {
2408 my ($self) = @_; 2750 my ($self) = @_;
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2764
2412 # TODO animation
2413 if ($tex) { 2765 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND; 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2783#############################################################################
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++;
2422 } 2822 }
2423} 2823}
2424 2824
2425############################################################################# 2825#############################################################################
2426 2826
… …
2462 2862
2463# popup given the event (must be a mouse button down event currently) 2863# popup given the event (must be a mouse button down event currently)
2464sub popup { 2864sub popup {
2465 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2466 2866
2467 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2468 2868
2469 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2870 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2472 2872
2473 $self->show; 2873 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 2875}
2476 2876
2477sub mouse_motion { 2877sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2479 2879
2480 # TODO: should use vbox->fdind_widget or so 2880 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2882 $self->{hover} = $self->{item}{$HOVER};
2483} 2883}
2484 2884
2485sub button_up { 2885sub button_up {
… …
2487 2887
2488 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2889 undef $GRAB;
2490 $self->hide; 2890 $self->hide;
2491 2891
2492 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2494 } 2894 }
2495} 2895}
2496 2896
2497############################################################################# 2897#############################################################################
2498 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
2499package CFClient::UI::Root; 3009package CFClient::UI::Root;
2500 3010
2501our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2502 3012
2503use CFClient::OpenGL; 3013use CFClient::OpenGL;
2504 3014
2505sub check_size { 3015sub new {
2506 my ($self) = @_; 3016 my $class = shift;
2507 3017
2508 $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
2509} 3026}
2510 3027
2511sub size_request { 3028sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2513}
2514 3030
2515sub 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 {
2516 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2517 3050
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2521 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)};
2522 3053
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2524 $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
2525 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2526 } 3061 }
2527} 3062}
2528 3063
2529sub _topleft { 3064sub coord2local {
2530 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2531 3066
2532 ($x, $y) 3067 ($x, $y)
2533} 3068}
2534 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2535sub update { 3076sub update {
2536 my ($self) = @_; 3077 my ($self) = @_;
2537 3078
2538 $self->check_size; 3079 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3080}
2541 3081
2542sub add { 3082sub add {
2543 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2544 3084
2545 # integerize window positions 3085 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 3086 for @children;
2547 $child->{y} = int $child->{y};
2548 3087
2549 $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 }
2550} 3104}
2551 3105
2552sub on_refresh { 3106sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2554 3108
2555 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2556} 3110}
2557 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2558sub draw { 3118sub draw {
2559 my ($self) = @_; 3119 my ($self) = @_;
2560 3120
2561 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2563 } 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
2564 3199
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2568 3203
2569 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3205 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3208 glLoadIdentity;
2574 3209
2575 $self->_draw; 3210 $self->_draw;
2576} 3211}
2577 3212
2578############################################################################# 3213#############################################################################
2579 3214
2580package CFClient::UI::Inventory; 3215package CFClient::UI::BindEditor;
2581 3216
2582our @ISA = CFClient::UI::Container::; 3217our @ISA = CFClient::UI::FancyFrame::;
2583
2584use CFClient::OpenGL;
2585 3218
2586sub new { 3219sub new {
2587 my $class = shift; 3220 my $class = shift;
2588 3221
2589 my $self = $class->SUPER::new (@_); 3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
2590 3275
2591 $self 3276 $self
2592} 3277}
2593 3278
2594sub size_allocate { 3279sub commit {
2595 my ($self, $w, $h) = @_; 3280 my ($self) = @_;
2596 3281 my ($mod, $sym, $cmds) = $self->get_binding;
2597 $self->{w} = $w; 3282 if ($sym != 0 && @$cmds > 0) {
2598 $self->{h} = $h; 3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
2599 3284 ."'. Don't forget 'Save Config'!");
2600 $self->check_size; 3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
2601} 3292}
2602 3293
2603sub set_items { 3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
2604 my ($self, $items) = @_; 3364 my ($self, $cmds) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607 3365
2608 $self->{real_items} = \@items; 3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
2609 3368
2610 for my $item (@items) { 3369 my $idx = 0;
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614 3370
3371 for (@$cmds) {
2615 $self->add (my $hb = new CFClient::UI::HBox); 3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
2616 3373
3374 my $i = $idx;
2617 $hb->add (my $f = new CFClient::UI::Face 3375 $hb->add (new CFClient::UI::Button
2618 can_events => 0, 3376 text => "delete",
2619 face => $item->{face}, 3377 tooltip => "Deletes the action from the record",
2620 anim => $item->{anim}, 3378 on_activate => sub {
2621 animspeed => $item->{animspeed}, 3379 $self->{cmdbox}->remove ($hb);
2622 expand => 1 3380 $cmds->[$i] = undef;
2623 ); 3381 });
3382
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1); 3383 $hb->add (new CFClient::UI::Label text => $_);
2625 }
2626 3384
2627 $self->{max_pos} = (scalar @items) - 1; 3385 $idx++
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 } 3386 }
2682} 3387}
2683 3388
2684 3389
2685############################################################################# 3390#############################################################################
2686 3391
2687package CFClient::UI; 3392package CFClient::UI;
2688 3393
2689$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3396
26921 33971
2693 3398

Diff Legend

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