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.174 by root, Tue Apr 25 11:18:49 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
818 $self->_render;
674 }; 819 };
675} 820}
676 821
677sub _draw { 822sub _draw {
678 my ($self) = @_; 823 my ($self) = @_;
… …
680 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
681 826
682 my $tex = $self->{texture} 827 my $tex = $self->{texture}
683 or return; 828 or return;
684 829
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
690 833
691 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
692 835
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
695} 837}
696 838
697############################################################################# 839#############################################################################
698 840
699package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
700 842
701our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
702
703sub new { die }
704
705sub size_request {
706 my ($self) = @_;
707
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710
711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728 844
729sub new { 845sub new {
730 my $class = shift; 846 my $class = shift;
731 847
732 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
733 bg => [1, 1, 1, 1], 849 scroll_x => 0,
734 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
735 border => 0.8,
736 @_ 851 @_,
737 ); 852 )
738
739 $self
740} 853}
741 854
742sub _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 {
743 my ($self) = @_; 867 my ($self, $w, $h) = @_;
744 868
745 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
746 870
747 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
749 glEnable GL_TEXTURE_2D;
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751 873
752# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
753# glColor 0, 0, 0, 0; 875 $self->update;
754# glVertex 0 , 0; 876}
755# glVertex 0 , $h;
756# glVertex $w, $h;
757# glVertex $w, 0;
758# glEnd;
759 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
760 880
761 $self->child->draw; 881 $self->{view_x} = int $x;
762 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
763 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;
764} 921}
765 922
766############################################################################# 923#############################################################################
767 924
768package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
769 926
770our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
771
772use CFClient::OpenGL;
773
774my @tex =
775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
776 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
777 928
778sub new { 929sub new {
779 my $class = shift; 930 my $class = shift;
780 931
781 # 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;
782 1035
783 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
786 border => 0.8, 1039 border => 0.6,
787 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
788 @_ 1043 @_
789 ); 1044 );
790 1045
791 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
792 align => 0, 1047 align => 0,
793 valign => 1, 1048 valign => 1,
794 text => $self->{title}, 1049 text => $self->{title},
795 fontsize => 1; 1050 fontsize => $self->{border};
796 1051
797 $self 1052 $self
798} 1053}
799 1054
800sub border { 1055sub border {
… …
816 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
817 1072
818 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
819 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
820 1075
821 $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)
822 if $self->{title}; 1077 if $self->{title};
823 1078
824 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
825} 1080}
826 1081
827sub button_down { 1082sub button_down {
828 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
829 1084
1085 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 1086 my $border = $self->border;
831 1087
832 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
837 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
838 $self->{motion} = sub { 1099 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
840 1101
841 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
842 1104
843 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
845 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
846 }; 1110 };
847 1111
848 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
853 1115
854 $self->{motion} = sub { 1116 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
856 1118
857 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
858 1120
859 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
860 $self->update;
861 }; 1122 };
862 } 1123 }
863} 1124}
864 1125
865sub button_up { 1126sub button_up {
… …
878 my ($self) = @_; 1139 my ($self) = @_;
879 1140
880 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
882 1143
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 1146
888 my $border = $self->border; 1147 my $border = $self->border;
889 1148
890 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
895 1154
896 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
897 1157
898 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
900 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
901 1161 $bg->{t} = $ch / $bg->{h};
902 glColor @{ $self->{bg} };
903
904 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
908 1164
909 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1166
912 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
913 $self->child->draw; 1169 $self->child->draw;
914} 1170}
915 1171
916############################################################################# 1172#############################################################################
917 1173
… …
926sub new { 1182sub new {
927 my $class = shift; 1183 my $class = shift;
928 1184
929 $class->SUPER::new ( 1185 $class->SUPER::new (
930 col_expand => [], 1186 col_expand => [],
931 @_ 1187 @_,
932 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
933} 1193}
934 1194
935sub add { 1195sub add {
936 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
937 1197
938 $child->set_parent ($self); 1198 $child->set_parent ($self);
939 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
940 1200
941 $child->check_size; 1201 $self->realloc;
942} 1202}
943 1203
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
948# 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?
949sub clear { 1205sub clear {
950 my ($self) = @_; 1206 my ($self) = @_;
951 1207
952 my @children = $self->children; 1208 my @children = $self->children;
953 delete $self->{children}; 1209 delete $self->{children};
… …
955 for (@children) { 1211 for (@children) {
956 delete $_->{parent}; 1212 delete $_->{parent};
957 $_->hide; 1213 $_->hide;
958 } 1214 }
959 1215
960 $self->update; 1216 $self->realloc;
961} 1217}
962 1218
963sub get_wh { 1219sub get_wh {
964 my ($self) = @_; 1220 my ($self) = @_;
965 1221
… …
996sub size_allocate { 1252sub size_allocate {
997 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
998 1254
999 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1000 1256
1001 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1002 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1003 1259
1004 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1005 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1006 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1007 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1061 } 1317 }
1062} 1318}
1063 1319
1064############################################################################# 1320#############################################################################
1065 1321
1066package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1067
1068# TODO: wrap into common Box base class
1069 1323
1070our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1071 1325
1072sub size_request { 1326sub size_request {
1073 my ($self) = @_; 1327 my ($self) = @_;
1074 1328
1075 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1076 1330 ? (
1077 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1078 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1079 (List::Util::max map $_->[1], @alloc), 1333 )
1080 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1081} 1338}
1082 1339
1083sub size_allocate { 1340sub size_allocate {
1084 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1085 1342
1086 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1087
1088 my $children = $self->{children}; 1344 my $children = $self->{children};
1089 1345
1090 my @h = map $_->{req_w}, @$children; 1346 my @req;
1091 1347
1092 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1093 1349 @req = ($space / (@$children || 1)) x @$children;
1094 if ($req_h > $h) {
1095 # ah well, not enough space
1096 $_ *= $h / $req_h for @h;
1097 } 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 {
1098 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1099 $exp ||= 1;
1100 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1101 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1102 my $child = $children->[$_];
1103
1104 my $alloc_h = $h[$_];
1105 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1106 $h[$_] = $alloc_h;
1107 } 1364 }
1108 } 1365 }
1109 1366
1110 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1111 1368
1112 my $y = 0; 1369 my $pos = 0;
1113 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1114 my $child = $children->[$_];
1115 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1116 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1117 1373
1118 $y += $h; 1374 $pos += $alloc;
1119 } 1375 }
1120 1376
1121 1 1377 1
1122} 1378}
1123 1379
1124############################################################################# 1380#############################################################################
1125 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
1126package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1127 1398
1128# TODO: wrap into common Box base class
1129
1130our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1131 1400
1132sub size_request { 1401sub new {
1133 my ($self) = @_; 1402 my $class = shift;
1134 1403
1135 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1136 1405 vertical => 1,
1137 ( 1406 @_,
1138 (List::Util::max map $_->[0], @alloc),
1139 (List::Util::sum map $_->[1], @alloc),
1140 ) 1407 )
1141} 1408}
1142 1409
1143sub size_allocate {
1144 my ($self, $w, $h) = @_;
1145
1146 my $children = $self->{children};
1147
1148 my @h = map $_->{req_h}, @$children;
1149
1150 my $req_h = List::Util::sum @h;
1151
1152 if ($req_h > $h) {
1153 # ah well, not enough space
1154 $_ *= $h / $req_h for @h;
1155 } else {
1156 my $exp = List::Util::sum map $_->{expand}, @$children;
1157 $exp ||= 1;
1158
1159 for (0 .. $#$children) {
1160 my $child = $children->[$_];
1161
1162 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1163 }
1164 }
1165
1166 CFClient::UI::harmonize \@h;
1167
1168 my $y = 0;
1169 for (0 .. $#$children) {
1170 my $child = $children->[$_];
1171 my $h = $h[$_];
1172 $child->configure (0, $y, $w, $h);
1173
1174 $y += $h;
1175 }
1176
1177 1
1178}
1179
1180############################################################################# 1410#############################################################################
1181 1411
1182package CFClient::UI::Label; 1412package CFClient::UI::Label;
1183 1413
1184our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1185 1415
1186use CFClient::OpenGL; 1416use CFClient::OpenGL;
1187 1417
1188sub new { 1418sub new {
1189 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1190 1420
1191 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1193 #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),
1194 fontsize => 1, 1431 fontsize => 1,
1195 text => "",
1196 align => -1, 1432 align => -1,
1197 valign => -1, 1433 valign => -1,
1198 padding => 2, 1434 padding_x => 2,
1199 layout => new CFClient::Layout, 1435 padding_y => 2,
1200 can_events => 0, 1436 can_events => 0,
1201 %arg 1437 %arg
1202 ); 1438 );
1203 1439
1204 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1443 $self->{template} = $layout;
1208 } 1444 }
1209 1445
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1211 $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 }
1212 1451
1213 $self 1452 $self
1214} 1453}
1215 1454
1216sub escape { 1455sub escape($) {
1217 local $_ = $_[1]; 1456 local $_ = $_[0];
1218 1457
1219 s/&/&amp;/g; 1458 s/&/&amp;/g;
1220 s/>/&gt;/g; 1459 s/>/&gt;/g;
1221 s/</&lt;/g; 1460 s/</&lt;/g;
1222 1461
1223 $_[1] 1462 $_
1224} 1463}
1225 1464
1226sub update { 1465sub update {
1227 my ($self) = @_; 1466 my ($self) = @_;
1228 1467
1229 delete $self->{texture}; 1468 delete $self->{texture};
1230 $self->SUPER::update; 1469 $self->SUPER::update;
1231} 1470}
1232 1471
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1239sub set_text { 1472sub set_text {
1240 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1241 1474
1242 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1244 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1246 1480
1247 delete $self->{texture}; 1481 $self->realloc;
1248 $self->update; 1482 $self->update;
1249 $self->check_size;
1250} 1483}
1251 1484
1252sub set_markup { 1485sub set_markup {
1253 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1254 1487
1255 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1257 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1259 1495
1260 delete $self->{texture}; 1496 $self->realloc;
1261 $self->update; 1497 $self->update;
1262 $self->check_size;
1263} 1498}
1264 1499
1265sub size_request { 1500sub size_request {
1266 my ($self) = @_; 1501 my ($self) = @_;
1267 1502
1268 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $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});
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271 1508
1272 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1273 1510
1274 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1279 1516
1280 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1281 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1282 } 1519 }
1283 1520
1284 ( 1521 ($w, $h)
1285 $w + $self->{padding} * 2,
1286 $h + $self->{padding} * 2,
1287 )
1288} 1522}
1289 1523
1290sub size_allocate { 1524sub size_allocate {
1291 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1292 1526
… …
1296sub set_fontsize { 1530sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1298 1532
1299 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1534 delete $self->{texture};
1301 $self->check_size; 1535
1302 $self->update; 1536 $self->realloc;
1303} 1537}
1304 1538
1305sub _draw { 1539sub _draw {
1306 my ($self) = @_; 1540 my ($self) = @_;
1307 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1308 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $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});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1312 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
1313 }; 1563 };
1314 1564
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 1567
1568 if ($tex->{format} == GL_ALPHA) {
1320 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $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 }
1335 1574
1336 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1576}
1339 1577
1340############################################################################# 1578#############################################################################
1341 1579
1342package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1355 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1356 can_hover => 1, 1594 can_hover => 1,
1357 can_focus => 1, 1595 can_focus => 1,
1358 valign => 0, 1596 valign => 0,
1359 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1360 @_ 1599 @_
1361 ) 1600 )
1362} 1601}
1363 1602
1364sub _set_text { 1603sub _set_text {
… …
1374 $self->{text} = $text; 1613 $self->{text} = $text;
1375 1614
1376 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1378 1617
1379 $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;
1380} 1628}
1381 1629
1382sub get_text { 1630sub get_text {
1383 $_[0]{text} 1631 $_[0]{text}
1384} 1632}
… …
1387 my ($self) = @_; 1635 my ($self) = @_;
1388 1636
1389 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1390 1638
1391 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1392}
1393
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398}
1399
1400sub set_text {
1401 my ($self, $text) = @_;
1402
1403 $self->{cursor} = length $text;
1404 $self->_set_text ($text);
1405 $self->update;
1406} 1640}
1407 1641
1408sub key_down { 1642sub key_down {
1409 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1410 1644
… …
1412 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1414 1648
1415 my $text = $self->get_text; 1649 my $text = $self->get_text;
1416 1650
1417 if ($sym == 8) { 1651 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 1664 $self->_emit ('escape');
1431 } elsif ($uni) { 1665 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1433 } 1667 }
1434 1668
1435 $self->_set_text ($text); 1669 $self->_set_text ($text);
1436 $self->update; 1670
1671 $self->realloc;
1437} 1672}
1438 1673
1439sub focus_in { 1674sub focus_in {
1440 my ($self) = @_; 1675 my ($self) = @_;
1441 1676
… …
1521 if ($sym == 13) { 1756 if ($sym == 13) {
1522 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1523 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1526 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1527 $self->update; 1762 $self->update;
1528 1763
1529 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1568 1803
1569sub new { 1804sub new {
1570 my $class = shift; 1805 my $class = shift;
1571 1806
1572 $class->SUPER::new ( 1807 $class->SUPER::new (
1573 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1574 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1577 can_hover => 1, 1812 can_hover => 1,
1578 align => 0, 1813 align => 0,
1579 valign => 0, 1814 valign => 0,
1580 can_events => 1, 1815 can_events => 1,
1581 @_ 1816 @_
1582 ) 1817 )
1583} 1818}
1584 1819
1820sub activate { }
1821
1585sub button_up { 1822sub button_up {
1586 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1587 1824
1825 $self->emit ("activate")
1588 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1589 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1590 $self->emit ("activate");
1591 }
1592} 1828}
1593 1829
1594sub _draw { 1830sub _draw {
1595 my ($self) = @_; 1831 my ($self) = @_;
1596 1832
… …
1598 1834
1599 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1601 } 1837 }
1602 1838
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1608 1842
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1844
1611 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1846
1614 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1615} 1848}
1616 1849
1617############################################################################# 1850#############################################################################
… …
1628 1861
1629sub new { 1862sub new {
1630 my $class = shift; 1863 my $class = shift;
1631 1864
1632 $class->SUPER::new ( 1865 $class->SUPER::new (
1633 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1634 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1635 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],
1636 state => 0, 1872 state => 0,
1637 can_hover => 1, 1873 can_hover => 1,
1638 @_ 1874 @_
1639 ) 1875 )
1640} 1876}
1641 1877
1642sub size_request { 1878sub size_request {
1643 my ($self) = @_; 1879 my ($self) = @_;
1644 1880
1645 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1646} 1882}
1647 1883
1648sub button_down { 1884sub button_down {
1649 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1650 1886
1651 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1652 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1653 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1654 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1655 } 1891 }
1656} 1892}
1657 1893
1658sub _draw { 1894sub _draw {
1659 my ($self) = @_; 1895 my ($self) = @_;
1660 1896
1661 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1662 1898
1663 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1664 1900
1665 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;
1666 1904
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 1906
1669 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1670 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 1912}
1680 1913
1681############################################################################# 1914#############################################################################
1682 1915
1683package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1726 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1727 1960
1728 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1729 } 1962 }
1730 1963
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 1966
1736 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 1968
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1740} 1970}
1741 1971
1742############################################################################# 1972#############################################################################
1743 1973
… …
1932 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1933 2163
1934sub new { 2164sub new {
1935 my $class = shift; 2165 my $class = shift;
1936 2166
1937 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1938 2168
1939 # TODO: 0-width page 2169 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2171 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1944 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],
1945 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1946 req_w => 20, 2178 min_w => $::WIDTH / 80,
1947 req_h => 20, 2179 min_h => $::WIDTH / 80,
1948 vertical => 0, 2180 vertical => 0,
1949 can_hover => 1, 2181 can_hover => 1,
1950 inner_pad => 5, 2182 inner_pad => 0.02,
1951 @_ 2183 @_
1952 ); 2184 );
1953 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1954 $self 2189 $self
1955} 2190}
1956 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
1957sub size_request { 2226sub size_request {
1958 my ($self) = @_; 2227 my ($self) = @_;
1959 2228
1960 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1961 my $h = $self->{req_h};
1962
1963 $self->{vertical} ? ($h, $w) : ($w, $h)
1964} 2230}
1965 2231
1966sub button_down { 2232sub button_down {
1967 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1968 2234
1969 $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
1970 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1971} 2240}
1972 2241
1973sub mouse_motion { 2242sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1975 2244
1976 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
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1978 2264
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1980 2266
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1983 2269
1984 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2272
1990 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1991 $self->update; 2274 $self->{knob_w} = $knob_w;
1992 } 2275 });
1993}
1994 2276
1995# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
2001} 2278}
2002 2279
2003sub _draw { 2280sub _draw {
2004 my ($self) = @_; 2281 my ($self) = @_;
2005 2282
2006 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
2007 2284
2008 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
2009 2286
2010 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2012 2289
2290 glTranslate 1, 0, 0;
2013 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2292 }
2018 2293
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2296
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2299
2045 # draw background 2300 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2302
2048 # draw handle 2303 # draw handle
2049 $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);
2050 2305
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2053} 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 (@_) }
2054 2349
2055############################################################################# 2350#############################################################################
2056 2351
2057package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2058 2353
… …
2067 fontsize => 1, 2362 fontsize => 1,
2068 can_events => 0, 2363 can_events => 0,
2069 #font => default_font 2364 #font => default_font
2070 @_, 2365 @_,
2071 2366
2072 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2073 par => [], 2368 par => [],
2074 height => 0, 2369 height => 0,
2075 children => [ 2370 children => [
2076 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
2078 ], 2373 ],
2079 ); 2374 );
2080 2375
2081 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2377
2085 $self 2378 $self
2086} 2379}
2087 2380
2088sub set_fontsize { 2381sub set_fontsize {
2089 my ($self, $fontsize) = @_; 2382 my ($self, $fontsize) = @_;
2090 2383
2091 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2092 $self->reflow; 2385 $self->reflow;
2093}
2094
2095sub text_height {
2096 my ($self, $text) = @_;
2097
2098 my $layout = $self->{layout};
2099
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w});
2102 $layout->set_text ($text);
2103
2104 ($layout->size)[1]
2105}
2106
2107sub reflow {
2108 my ($self) = @_;
2109
2110 $self->{need_reflow}++;
2111 $self->update;
2112} 2386}
2113 2387
2114sub size_allocate { 2388sub size_allocate {
2115 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2116 2390
… …
2121 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2122 2396
2123 $self->reflow; 2397 $self->reflow;
2124} 2398}
2125 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
2126sub add_paragraph { 2434sub add_paragraph {
2127 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2128 2436
2129 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2130 2438 my ($w, $h) = $self->text_size ($line);
2131 my $height = $self->text_height ($text);
2132
2133 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2134 2442
2135 push @{$self->{par}}, [$height, $color, $text];
2136
2137 $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]);
2138 $self->{children}[1]->update;
2139} 2444}
2140 2445
2141sub update { 2446sub update {
2142 my ($self) = @_; 2447 my ($self) = @_;
2143 2448
… …
2145 2450
2146 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2147 2452
2148 delete $self->{texture}; 2453 delete $self->{texture};
2149 2454
2150 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2151 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2152 my $height = 0; 2459 my $height = 0;
2153 2460
2154 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2155 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 }
2156 2476
2157 $self->{height} = $height; 2477 $self->{height} = $height;
2158 2478
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2160 2480
2161 delete $self->{texture}; 2481 delete $self->{texture};
2162 } 2482 }
2163 2483
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2165 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2167 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
2168 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172
2173 my $top = int $self->{children}[1]{range}[0];
2174
2175 my $y0 = $top;
2176 my $y1 = $top + $self->{h};
2177
2178 my $y = 0;
2179
2180 my $layout = $self->{layout};
2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183 2502
2184 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2504 my $h = $par->[1];
2186 2505
2187 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]);
2188 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2189 2510
2190 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2191 my ($W, $H) = $layout->size; 2512
2192 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;
2193 } 2515 }
2194 2516
2195 $y += $h; 2517 $y += $h;
2196 } 2518 }
2197 2519
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2200 }; 2521 };
2201 }); 2522 });
2202} 2523}
2203 2524
2204sub _draw { 2525sub _draw {
2205 my ($self) = @_; 2526 my ($self) = @_;
2206 2527
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2212 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2213 }
2214 2533
2215 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2216 2535
2217} 2536}
2218 2537
… …
2266 2585
2267sub new { 2586sub new {
2268 my $class = shift; 2587 my $class = shift;
2269 2588
2270 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2271 state => 0, 2590 state => 0,
2272 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2273 @_ 2592 @_
2274 ); 2593 );
2275 2594
2276 if ($self->{state}) {
2277 $self->{state} = 0;
2278 $self->toggle_flopper;
2279 }
2280
2281 $self 2595 $self
2282} 2596}
2283 2597
2284sub toggle_flopper { 2598sub toggle_flopper {
2285 my ($self) = @_; 2599 my ($self) = @_;
2286 2600
2287 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2288 if ($self->{state} = !$self->{state}) {
2289 $CFClient::UI::ROOT->add ($self->{other});
2290 $self->{other}->move ($self->coord2global (0, $self->{h}));
2291 $self->emit ("open");
2292 } else {
2293 $CFClient::UI::ROOT->remove ($self->{other});
2294 $self->emit ("close");
2295 }
2296
2297 $self->emit (changed => $self->{state});
2298} 2602}
2299 2603
2300############################################################################# 2604#############################################################################
2301 2605
2302package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2312 @_, 2616 @_,
2313 can_events => 0, 2617 can_events => 0,
2314 ) 2618 )
2315} 2619}
2316 2620
2317sub set_markup { 2621sub set_tooltip_from {
2318 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2319 2623
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2321 $self->{label}->set_markup ($text); 2625
2322 $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 );
2323} 2641}
2324 2642
2325sub size_request { 2643sub size_request {
2326 my ($self) = @_; 2644 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329 2645
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2647
2332 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2333} 2649}
… …
2336 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2337 2653
2338 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2339} 2655}
2340 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
2341sub _draw { 2675sub _draw {
2342 my ($self) = @_; 2676 my ($self) = @_;
2343 2677
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2346 2679
2347 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2348 2681
2349 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2360 glVertex 0 , $h; 2693 glVertex 0 , $h;
2361 glVertex $w, $h; 2694 glVertex $w, $h;
2362 glVertex $w, 0; 2695 glVertex $w, 0;
2363 glEnd; 2696 glEnd;
2364 2697
2365 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2366 2699
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2369} 2701}
2370 2702
2371############################################################################# 2703#############################################################################
2372 2704
… …
2377use CFClient::OpenGL; 2709use CFClient::OpenGL;
2378 2710
2379sub new { 2711sub new {
2380 my $class = shift; 2712 my $class = shift;
2381 2713
2382 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2383 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2384 @_, 2717 @_,
2385 ) 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
2386} 2735}
2387 2736
2388sub size_request { 2737sub size_request {
2389 (32, 8) 2738 (32, 8)
2390} 2739}
2391 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2392sub draw { 2749sub _draw {
2393 my ($self) = @_; 2750 my ($self) = @_;
2394 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
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2396 2764
2397 if ($tex) { 2765 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2407} 2781}
2408 2782
2409############################################################################# 2783#############################################################################
2410 2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2992 }
2993
2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
2411package CFClient::UI::Root; 3009package CFClient::UI::Root;
2412 3010
2413our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2414 3012
2415use CFClient::OpenGL; 3013use CFClient::OpenGL;
2416 3014
2417sub check_size { 3015sub new {
2418 my ($self) = @_; 3016 my $class = shift;
2419 3017
2420 $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
2421} 3026}
2422 3027
2423sub size_request { 3028sub size_request {
2424 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2425}
2426 3030
2427sub 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 {
2428 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2429 3050
2430 $self->SUPER::configure ($x, $y, $w, $h);
2431
2432 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2433 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)};
2434 3053
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2436 $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
2437 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2438 } 3061 }
2439} 3062}
2440 3063
2441sub _topleft { 3064sub coord2local {
2442 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2443 3066
2444 ($x, $y) 3067 ($x, $y)
2445} 3068}
2446 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2447sub update { 3076sub update {
2448 my ($self) = @_; 3077 my ($self) = @_;
2449 3078
2450 $self->check_size; 3079 $::WANT_REFRESH++;
2451 ::refresh ();
2452} 3080}
2453 3081
2454sub add { 3082sub add {
2455 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2456 3084
2457 # integerize window positions 3085 $_->{is_toplevel} = 1
2458 $child->{x} = int $child->{x}; 3086 for @children;
2459 $child->{y} = int $child->{y};
2460 3087
2461 $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 }
2462} 3104}
2463 3105
2464sub on_refresh { 3106sub on_refresh {
2465 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2466 3108
2467 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2468} 3110}
2469 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2470sub draw { 3118sub draw {
2471 my ($self) = @_; 3119 my ($self) = @_;
2472 3120
2473 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2474 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2475 } 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
2476 3199
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2480 3203
2481 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity; 3205 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2484 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity; 3208 glLoadIdentity;
2486 3209
2487 $self->_draw; 3210 $self->_draw;
2488} 3211}
2489 3212
2490############################################################################# 3213#############################################################################
2491 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
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 {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
2492package CFClient::UI; 3392package CFClient::UI;
2493 3393
2494$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip; 3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2496 3396
24971 33971
2498 3398

Diff Legend

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