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.166 by root, Mon Apr 24 08:38:36 2006 UTC vs.
Revision 1.260 by elmex, Tue May 30 14:35:09 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 74 if $FOCUS;
46} 75}
47 76
48sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 79 if $FOCUS;
51} 80}
52 81
53sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
54 my ($ev) = @_; 83 my ($ev) = @_;
… …
63 check_tooltip; 92 check_tooltip;
64 } 93 }
65 94
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 96
68 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 99}
73 100
74sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
75 my ($ev) = @_; 102 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
77 104
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 106
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 108
82 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 111
87 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 114 $grab->update if $grab;
90 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 132
108 check_tooltip; 133 check_tooltip;
109 } 134 }
110 135
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 137 if $HOVER;
115} 138}
116 139
117# convert position array to integers 140# convert position array to integers
118sub harmonize { 141sub harmonize {
119 my ($vals) = @_; 142 my ($vals) = @_;
… …
125 $rem += $_ - $i; 148 $rem += $_ - $i;
126 $_ = $i; 149 $_ = $i;
127 } 150 }
128} 151}
129 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
130############################################################################# 194#############################################################################
131 195
132package CFClient::UI::Base; 196package CFClient::UI::Base;
133 197
134use strict; 198use strict;
… …
137 201
138sub new { 202sub new {
139 my $class = shift; 203 my $class = shift;
140 204
141 my $self = bless { 205 my $self = bless {
142 x => 0, 206 x => "center",
143 y => 0, 207 y => "center",
144 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
145 can_events => 1, 211 can_events => 1,
146 @_ 212 @_
147 }, $class; 213 }, $class;
148 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
149 for (keys %$self) { 217 for (keys %$self) {
150 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
152 } 220 }
153 } 221 }
154 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
155 $self 235 $self
156} 236}
157 237
158sub destroy { 238sub destroy {
159 my ($self) = @_; 239 my ($self) = @_;
… …
168 return if $self->{parent}; 248 return if $self->{parent};
169 249
170 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
171} 251}
172 252
173sub hide { 253sub set_visible {
174 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
175 277
176 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
178 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
179 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
180 if $self->{parent}; 312 if $self->{parent};
181} 313}
182 314
183sub move { 315sub move_abs {
184 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
185 317
186 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
189 321
190 $self->update; 322 $self->update;
191} 323}
192 324
193sub set_size { 325sub set_size {
194 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
195 327
196 $self->{user_w} = $w; 328 $self->{force_w} = $w;
197 $self->{user_h} = $h; 329 $self->{force_h} = $h;
198 330
199 $self->check_size; 331 $self->realloc;
200} 332}
201 333
202sub size_request { 334sub size_request {
203 require Carp; 335 require Carp;
204 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
206 338
207sub configure { 339sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
209 341
210 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
213 347
214 # use alignment to adjust x, y 348 # use alignment to adjust x, y
215 349
216 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 352 }
221 353
222 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 355 $self->{x} = $x;
224 $self->{y} = $y; 356 $self->{y} = $y;
225 $self->update; 357 $self->update;
226 } 358 }
227 359
228 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
229 $self->{w} = $w; 363 $self->{alloc_w} = $w;
230 $self->{h} = $h; 364 $self->{alloc_h} = $h;
231 365
232 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 367 }
235} 368}
236 369
237sub size_allocate { 370sub size_allocate {
238 # nothing to be done 371 # nothing to be done
239} 372}
240 373
374sub children {
375}
376
241sub set_max_size { 377sub set_max_size {
242 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
243 379
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 382}
247 383
248# return top left coordinates 384sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
251 386
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
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 }
253} 398}
254 399
255# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
256sub coord2local { 401sub coord2local {
257 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
258 403
259 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 405}
262 406
263# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
264sub coord2global { 408sub coord2global {
265 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
266 410
267 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 412}
270 413
271sub focus_in { 414sub focus_in {
272 my ($self) = @_; 415 my ($self) = @_;
273 416
274 return if $FOCUS == $self; 417 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
276 419
277 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
278 421
279 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
280 423
281 $focus->update if $focus; 424 $focus->update if $focus;
282 $FOCUS->update; 425 $FOCUS->update;
283} 426}
284 427
… …
287 430
288 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
289 432
290 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
291 434
292 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
293 436
294 $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;
295} 441}
296 442
297sub mouse_motion { } 443sub mouse_motion { }
298sub button_up { } 444sub button_up { }
299sub key_down { } 445sub key_down { }
300sub key_up { } 446sub key_up { }
301 447
302sub button_down { 448sub button_down {
303 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
304 450
305 $self->focus_in; 451 $self->focus_in;
… …
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
312sub 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}
313 529
314sub draw { 530sub draw {
315 my ($self) = @_; 531 my ($self) = @_;
316 532
317 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
334 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
335 glEnd; 551 glEnd;
336 glDisable GL_BLEND; 552 glDisable GL_BLEND;
337 } 553 }
338 554
339 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
340 glPushMatrix; 556 glPushMatrix;
341 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 560 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
346 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
347 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
348 glEnd; 564 glEnd;
349 glPopMatrix; 565 glPopMatrix;
350 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;
351 } 567 }
352} 568}
353 569
354sub _draw { 570sub _draw {
355 my ($self) = @_; 571 my ($self) = @_;
356 572
357 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
358} 574}
359 575
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 576sub DESTROY {
424 my ($self) = @_; 577 my ($self) = @_;
425 578
579 delete $WIDGET{$self+0};
426 #$self->deactivate; 580 #$self->deactivate;
427} 581}
428 582
429############################################################################# 583#############################################################################
430 584
… …
439 my $class = shift; 593 my $class = shift;
440 594
441 # range [value, low, high, page] 595 # range [value, low, high, page]
442 596
443 $class->SUPER::new ( 597 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
446 @_ 600 @_
447 ) 601 )
448} 602}
449 603
450sub _draw { 604sub _draw {
451 my ($self) = @_; 605 my ($self) = @_;
452 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
454 613
455 glEnable GL_BLEND; 614 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
458 617
459 glBegin GL_QUADS; 618 glBegin GL_QUADS;
460 glVertex 0 , 0; 619 glVertex 0 , 0;
461 glVertex 0 , $h; 620 glVertex 0 , $h;
462 glVertex $w, $h; 621 glVertex $w, $h;
463 glVertex $w, 0; 622 glVertex $w, 0;
464 glEnd; 623 glEnd;
465 624
466 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
467} 627}
468 628
469############################################################################# 629#############################################################################
470 630
471package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
478} 638}
479 639
480sub size_request { 640sub size_request {
481 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
482} 644}
483 645
484sub draw { } 646sub draw { }
485 647
486############################################################################# 648#############################################################################
… …
503 665
504 $self 666 $self
505} 667}
506 668
507sub add { 669sub add {
508 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
509 671
510 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
511 674
512 use sort 'stable'; 675 use sort 'stable';
513 676
514 $self->{children} = [ 677 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
517 ]; 680 ];
518 681
519 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
520} 687}
521 688
522sub remove { 689sub remove {
523 my ($self, $child) = @_; 690 my ($self, $child) = @_;
524 691
525 delete $child->{parent}; 692 delete $child->{parent};
526 $child->hide; 693 $child->hide;
527 694
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 696
530 $self->check_size; 697 $self->realloc;
531 $self->update;
532} 698}
533 699
534sub clear { 700sub clear {
535 my ($self) = @_; 701 my ($self) = @_;
536 702
… …
539 705
540 for (@$children) { 706 for (@$children) {
541 delete $_->{parent}; 707 delete $_->{parent};
542 $_->hide; 708 $_->hide;
543 } 709 }
710
711 $self->realloc;
544} 712}
545 713
546sub find_widget { 714sub find_widget {
547 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
548 716
… …
623} 791}
624 792
625sub update { 793sub update {
626 my ($self) = @_; 794 my ($self) = @_;
627 795
628 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 797 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 798}
642 799
643sub size_allocate { 800sub size_allocate {
644 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
645 802
646 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
647 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
648 $self->render_chld; 818 $self->_render;
819 };
649} 820}
650 821
651sub _draw { 822sub _draw {
652 my ($self) = @_; 823 my ($self) = @_;
653 824
654 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
655 826
656 my $tex = $self->{texture} 827 my $tex = $self->{texture}
657 or return; 828 or return;
658 829
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
663 833
664 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 835
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
668} 837}
669 838
670############################################################################# 839#############################################################################
671 840
672package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
673 842
674our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
696package CFClient::UI::Frame;
697
698our @ISA = CFClient::UI::Bin::;
699
700use CFClient::OpenGL;
701 844
702sub new { 845sub new {
703 my $class = shift; 846 my $class = shift;
704 847
705 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
706 bg => [1, 1, 1, 1], 849 scroll_x => 0,
707 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
708 border => 0.8,
709 @_ 851 @_,
710 ); 852 )
711
712 $self
713} 853}
714 854
715sub _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 {
716 my ($self) = @_; 867 my ($self, $w, $h) = @_;
717 868
718 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
719 870
720 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 873
725# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
726# glColor 0, 0, 0, 0; 875 $self->update;
727# glVertex 0 , 0; 876}
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
733 880
734 $self->child->draw; 881 $self->{view_x} = int $x;
735 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
736 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;
737} 921}
738 922
739############################################################################# 923#############################################################################
740 924
741package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
742 926
743our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
744
745use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750 928
751sub new { 929sub new {
752 my $class = shift; 930 my $class = shift;
753 931
754 # 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;
755 1035
756 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
759 border => 0.8, 1039 border => 0.6,
760 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
761 @_ 1043 @_
762 ); 1044 );
763 1045
764 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 1047 align => 0,
766 valign => 1, 1048 valign => 1,
767 text => $self->{title}, 1049 text => $self->{title},
768 fontsize => 1; 1050 fontsize => $self->{border};
769 1051
770 $self 1052 $self
771} 1053}
772 1054
773sub border { 1055sub border {
… …
789 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
790 1072
791 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
793 1075
794 $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)
795 if $self->{title}; 1077 if $self->{title};
796 1078
797 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
798} 1080}
799 1081
800sub button_down { 1082sub button_down {
801 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
802 1084
1085 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 1086 my $border = $self->border;
804 1087
805 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
810 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
811 $self->{motion} = sub { 1099 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
813 1101
814 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
815 1104
816 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
818 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
819 }; 1110 };
820 1111
821 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
826 1115
827 $self->{motion} = sub { 1116 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
829 1118
830 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
831 1120
832 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
833 $self->update;
834 }; 1122 };
835 } 1123 }
836} 1124}
837 1125
838sub button_up { 1126sub button_up {
… …
851 my ($self) = @_; 1139 my ($self) = @_;
852 1140
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 1143
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1146
861 my $border = $self->border; 1147 my $border = $self->border;
862 1148
863 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1154
869 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
870 1157
871 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
873 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
874 1161 $bg->{t} = $ch / $bg->{h};
875 glColor @{ $self->{bg} };
876
877 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
881 1164
882 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1166
885 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
886 $self->child->draw; 1169 $self->child->draw;
887} 1170}
888 1171
889############################################################################# 1172#############################################################################
890 1173
… …
899sub new { 1182sub new {
900 my $class = shift; 1183 my $class = shift;
901 1184
902 $class->SUPER::new ( 1185 $class->SUPER::new (
903 col_expand => [], 1186 col_expand => [],
904 @_ 1187 @_,
905 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
906} 1193}
907 1194
908sub add { 1195sub add {
909 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
910 1197
911 $child->set_parent ($self); 1198 $child->set_parent ($self);
912 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
913 1200
914 $child->check_size; 1201 $self->realloc;
915} 1202}
916 1203
917# 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?
918sub clear { 1205sub clear {
919 my ($self) = @_; 1206 my ($self) = @_;
920 1207
921 my $children = delete $self->{children}; 1208 my @children = $self->children;
1209 delete $self->{children};
922 1210
923 for (grep $_, map @$_, grep $_, @$children) { 1211 for (@children) {
924 delete $_->{parent}; 1212 delete $_->{parent};
925 $_->hide; 1213 $_->hide;
926 } 1214 }
927 1215
928 $self->update; 1216 $self->realloc;
929} 1217}
930 1218
931sub get_wh { 1219sub get_wh {
932 my ($self) = @_; 1220 my ($self) = @_;
933 1221
… …
964sub size_allocate { 1252sub size_allocate {
965 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
966 1254
967 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
968 1256
969 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
970 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
971 1259
972 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
973 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
974 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
975 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1029 } 1317 }
1030} 1318}
1031 1319
1032############################################################################# 1320#############################################################################
1033 1321
1034package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1035
1036# TODO: wrap into common Box base class
1037 1323
1038our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1039 1325
1040sub size_request { 1326sub size_request {
1041 my ($self) = @_; 1327 my ($self) = @_;
1042 1328
1043 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1044 1330 ? (
1045 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1046 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1047 (List::Util::max map $_->[1], @alloc), 1333 )
1048 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1049} 1338}
1050 1339
1051sub size_allocate { 1340sub size_allocate {
1052 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1053 1342
1054 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1055
1056 my $children = $self->{children}; 1344 my $children = $self->{children};
1057 1345
1058 my @h = map $_->{req_w}, @$children; 1346 my @req;
1059 1347
1060 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1061 1349 @req = ($space / (@$children || 1)) x @$children;
1062 if ($req_h > $h) {
1063 # ah well, not enough space
1064 $_ *= $h / $req_h for @h;
1065 } 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 {
1066 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1067 $exp ||= 1;
1068 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1069 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1070 my $child = $children->[$_];
1071
1072 my $alloc_h = $h[$_];
1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1074 $h[$_] = $alloc_h;
1075 } 1364 }
1076 } 1365 }
1077 1366
1078 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1079 1368
1080 my $y = 0; 1369 my $pos = 0;
1081 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1082 my $child = $children->[$_];
1083 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1084 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1085 1373
1086 $y += $h; 1374 $pos += $alloc;
1087 } 1375 }
1088 1376
1089 1 1377 1
1090} 1378}
1091 1379
1092############################################################################# 1380#############################################################################
1093 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
1094package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1095 1398
1096# TODO: wrap into common Box base class
1097
1098our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1099 1400
1100sub size_request { 1401sub new {
1101 my ($self) = @_; 1402 my $class = shift;
1102 1403
1103 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1104 1405 vertical => 1,
1105 ( 1406 @_,
1106 (List::Util::max map $_->[0], @alloc),
1107 (List::Util::sum map $_->[1], @alloc),
1108 ) 1407 )
1109} 1408}
1110 1409
1111sub size_allocate {
1112 my ($self, $w, $h) = @_;
1113
1114 my $children = $self->{children};
1115
1116 my @h = map $_->{req_h}, @$children;
1117
1118 my $req_h = List::Util::sum @h;
1119
1120 if ($req_h > $h) {
1121 # ah well, not enough space
1122 $_ *= $h / $req_h for @h;
1123 } else {
1124 my $exp = List::Util::sum map $_->{expand}, @$children;
1125 $exp ||= 1;
1126
1127 for (0 .. $#$children) {
1128 my $child = $children->[$_];
1129
1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1131 }
1132 }
1133
1134 CFClient::UI::harmonize \@h;
1135
1136 my $y = 0;
1137 for (0 .. $#$children) {
1138 my $child = $children->[$_];
1139 my $h = $h[$_];
1140 $child->configure (0, $y, $w, $h);
1141
1142 $y += $h;
1143 }
1144
1145 1
1146}
1147
1148############################################################################# 1410#############################################################################
1149 1411
1150package CFClient::UI::Label; 1412package CFClient::UI::Label;
1151 1413
1152our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1153 1415
1154use CFClient::OpenGL; 1416use CFClient::OpenGL;
1155 1417
1156sub new { 1418sub new {
1157 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1158 1420
1159 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1161 #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),
1162 fontsize => 1, 1431 fontsize => 1,
1163 text => "",
1164 align => -1, 1432 align => -1,
1165 valign => -1, 1433 valign => -1,
1166 padding => 2, 1434 padding_x => 2,
1167 layout => new CFClient::Layout, 1435 padding_y => 2,
1168 can_events => 0, 1436 can_events => 0,
1169 %arg 1437 %arg
1170 ); 1438 );
1171 1439
1172 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1443 $self->{template} = $layout;
1176 } 1444 }
1177 1445
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1179 $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 }
1180 1451
1181 $self 1452 $self
1182} 1453}
1183 1454
1184sub escape { 1455sub escape($) {
1185 local $_ = $_[1]; 1456 local $_ = $_[0];
1186 1457
1187 s/&/&amp;/g; 1458 s/&/&amp;/g;
1188 s/>/&gt;/g; 1459 s/>/&gt;/g;
1189 s/</&lt;/g; 1460 s/</&lt;/g;
1190 1461
1191 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1192} 1470}
1193 1471
1194sub set_text { 1472sub set_text {
1195 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1196 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1198 1480
1199 delete $self->{texture}; 1481 $self->realloc;
1200 $self->check_size;
1201 $self->update; 1482 $self->update;
1202} 1483}
1203 1484
1204sub set_markup { 1485sub set_markup {
1205 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1206 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1208 1495
1209 delete $self->{texture}; 1496 $self->realloc;
1210 $self->check_size;
1211 $self->update; 1497 $self->update;
1212} 1498}
1213 1499
1214sub size_request { 1500sub size_request {
1215 my ($self) = @_; 1501 my ($self) = @_;
1216 1502
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $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});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1508
1221 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1222 1510
1223 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1228 1516
1229 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1231 } 1519 }
1232 1520
1233 ( 1521 ($w, $h)
1234 $w + $self->{padding} * 2,
1235 $h + $self->{padding} * 2,
1236 )
1237} 1522}
1238 1523
1239sub size_allocate { 1524sub size_allocate {
1240 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1241 1526
… …
1245sub set_fontsize { 1530sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1247 1532
1248 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1534 delete $self->{texture};
1250 $self->check_size; 1535
1251 $self->update; 1536 $self->realloc;
1252} 1537}
1253 1538
1254sub _draw { 1539sub _draw {
1255 my ($self) = @_; 1540 my ($self) = @_;
1256 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1257 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $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});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1261 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
1262 }; 1563 };
1263 1564
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1567
1568 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $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 }
1284 1574
1285 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1576}
1288 1577
1289############################################################################# 1578#############################################################################
1290 1579
1291package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1305 can_hover => 1, 1594 can_hover => 1,
1306 can_focus => 1, 1595 can_focus => 1,
1307 valign => 0, 1596 valign => 0,
1308 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1309 @_ 1599 @_
1310 ) 1600 )
1311} 1601}
1312 1602
1313sub _set_text { 1603sub _set_text {
… …
1323 $self->{text} = $text; 1613 $self->{text} = $text;
1324 1614
1325 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1327 1617
1328 $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;
1329} 1628}
1330 1629
1331sub get_text { 1630sub get_text {
1332 $_[0]{text} 1631 $_[0]{text}
1333} 1632}
… …
1336 my ($self) = @_; 1635 my ($self) = @_;
1337 1636
1338 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1339 1638
1340 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1640}
1356 1641
1357sub key_down { 1642sub key_down {
1358 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1359 1644
… …
1361 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1363 1648
1364 my $text = $self->get_text; 1649 my $text = $self->get_text;
1365 1650
1366 if ($sym == 8) { 1651 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1664 $self->_emit ('escape');
1380 } elsif ($uni) { 1665 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1382 } 1667 }
1383 1668
1384 $self->_set_text ($text); 1669 $self->_set_text ($text);
1385 $self->update; 1670
1671 $self->realloc;
1386} 1672}
1387 1673
1388sub focus_in { 1674sub focus_in {
1389 my ($self) = @_; 1675 my ($self) = @_;
1390 1676
… …
1466 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1467 1753
1468 my $sym = $ev->{sym}; 1754 my $sym = $ev->{sym};
1469 1755
1470 if ($sym == 13) { 1756 if ($sym == 13) {
1757 unshift @{$self->{history}},
1758 my $txt = $self->get_text;
1759 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = '';
1471 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1472 $self->update; 1762 $self->update;
1763
1764 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text;
1767 }
1768 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++;
1770 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1771 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 }
1775
1776 } elsif ($sym == CFClient::SDLK_DOWN) {
1777 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779
1780 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else {
1783 $self->set_text ($self->{history_saveback});
1784 }
1473 1785
1474 } else { 1786 } else {
1475 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1476 } 1788 }
1477 1789
… …
1491 1803
1492sub new { 1804sub new {
1493 my $class = shift; 1805 my $class = shift;
1494 1806
1495 $class->SUPER::new ( 1807 $class->SUPER::new (
1496 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1497 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1498 bg => [1, 1, 1, 0.2],
1499 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1500 can_hover => 1, 1812 can_hover => 1,
1501 align => 0, 1813 align => 0,
1502 valign => 0, 1814 valign => 0,
1503 can_events => 1, 1815 can_events => 1,
1504 @_ 1816 @_
1505 ) 1817 )
1506} 1818}
1507 1819
1820sub activate { }
1821
1508sub button_up { 1822sub button_up {
1509 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1510 1824
1825 $self->emit ("activate")
1511 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1512 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1513 $self->emit ("activate");
1514 }
1515} 1828}
1516 1829
1517sub _draw { 1830sub _draw {
1518 my ($self) = @_; 1831 my ($self) = @_;
1519 1832
… …
1521 1834
1522 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1523 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1524 } 1837 }
1525 1838
1526 glEnable GL_BLEND;
1527 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1528 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1530 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1531 1842
1532 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1533 1844
1534 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536 1846
1537 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1538} 1848}
1539 1849
1540############################################################################# 1850#############################################################################
… …
1551 1861
1552sub new { 1862sub new {
1553 my $class = shift; 1863 my $class = shift;
1554 1864
1555 $class->SUPER::new ( 1865 $class->SUPER::new (
1556 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1557 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1558 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],
1559 state => 0, 1872 state => 0,
1560 can_hover => 1, 1873 can_hover => 1,
1561 @_ 1874 @_
1562 ) 1875 )
1563} 1876}
1564 1877
1565sub size_request { 1878sub size_request {
1566 my ($self) = @_; 1879 my ($self) = @_;
1567 1880
1568 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1569} 1882}
1570 1883
1571sub button_down { 1884sub button_down {
1572 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1573 1886
1574 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1575 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1576 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1577 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1578 } 1891 }
1579} 1892}
1580 1893
1581sub _draw { 1894sub _draw {
1582 my ($self) = @_; 1895 my ($self) = @_;
1583 1896
1584 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1585 1898
1586 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1587 1900
1588 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;
1589 1904
1590 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1591 1906
1592 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1593 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595
1596 my $tex = $self->{state} ? $tex[1] : $tex[0];
1597
1598 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1599
1600 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1601 glDisable GL_BLEND;
1602} 1912}
1603 1913
1604############################################################################# 1914#############################################################################
1605 1915
1606package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1649 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1650 1960
1651 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1652 } 1962 }
1653 1963
1654 glEnable GL_BLEND;
1655 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1656 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1657 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1658 1966
1659 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1660 1968
1661 glDisable GL_BLEND;
1662 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1663} 1970}
1664 1971
1665############################################################################# 1972#############################################################################
1666 1973
… …
1714} 2021}
1715 2022
1716sub set_max { 2023sub set_max {
1717 my ($self, $max) = @_; 2024 my ($self, $max) = @_;
1718 2025
2026 return if $self->{max_val} == $max;
2027
1719 $self->{max_val} = $max; 2028 $self->{max_val} = $max;
2029 $self->update;
1720} 2030}
1721 2031
1722sub set_value { 2032sub set_value {
1723 my ($self, $val, $max) = @_; 2033 my ($self, $val, $max) = @_;
1724 2034
1725 $self->set_max ($max) 2035 $self->set_max ($max)
1726 if defined $max; 2036 if defined $max;
1727 2037
1728 $max = $self->{max_val}; 2038 return if $self->{val} == $val;
2039
1729 $self->{val} = $val; 2040 $self->{val} = $val;
1730
1731 $self->update; 2041 $self->update;
1732} 2042}
1733 2043
1734sub _draw { 2044sub _draw {
1735 my ($self) = @_; 2045 my ($self) = @_;
… …
1798 2108
1799sub new { 2109sub new {
1800 my ($class, %arg) = @_; 2110 my ($class, %arg) = @_;
1801 2111
1802 my $self = $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1803 tooltip => $arg{type}, 2113 tooltip => $arg{type},
1804 can_hover => 1, 2114 can_hover => 1,
2115 can_events => 1,
1805 %arg, 2116 %arg,
1806 ); 2117 );
1807 2118
1808 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1809 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1817 2128
1818 $self->{value}->set_fontsize ($fsize); 2129 $self->{value}->set_fontsize ($fsize);
1819 $self->{max} ->set_fontsize ($fsize); 2130 $self->{max} ->set_fontsize ($fsize);
1820} 2131}
1821 2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
1822sub set_value { 2140sub set_value {
1823 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1824 2142
1825 $self->set_max ($max) 2143 $self->set_max ($max)
1826 if defined $max; 2144 if defined $max;
1827 2145
1828 $self->{gauge}->set_value ($val, $max); 2146 $self->{gauge}->set_value ($val, $max);
1829 $self->{value}->set_text ($val); 2147 $self->{value}->set_text ($val);
1830}
1831
1832sub set_max {
1833 my ($self, $max) = @_;
1834
1835 $self->{gauge}->set_max ($max);
1836 $self->{max}->set_text ($max);
1837} 2148}
1838 2149
1839############################################################################# 2150#############################################################################
1840 2151
1841package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
… …
1851 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1852 2163
1853sub new { 2164sub new {
1854 my $class = shift; 2165 my $class = shift;
1855 2166
1856 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1857 2168
1858 # TODO: 0-width page 2169 # TODO: 0-width page
1859 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1860 # TODO: calculations are off 2171 # TODO: calculations are off
1861 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1862 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1863 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],
1864 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1865 req_w => 20, 2178 min_w => $::WIDTH / 80,
1866 req_h => 20, 2179 min_h => $::WIDTH / 80,
1867 vertical => 0, 2180 vertical => 0,
1868 can_hover => 1, 2181 can_hover => 1,
1869 inner_pad => 5, 2182 inner_pad => 0.02,
1870 @_ 2183 @_
1871 ); 2184 );
1872 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1873 $self 2189 $self
1874} 2190}
1875 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
1876sub size_request { 2226sub size_request {
1877 my ($self) = @_; 2227 my ($self) = @_;
1878 2228
1879 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1880 my $h = $self->{req_h};
1881
1882 $self->{vertical} ? ($h, $w) : ($w, $h)
1883} 2230}
1884 2231
1885sub button_down { 2232sub button_down {
1886 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1887 2234
1888 $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
1889 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1890} 2240}
1891 2241
1892sub mouse_motion { 2242sub mouse_motion {
1893 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1894 2244
1895 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
1896 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1897 2264
1898 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1899 2266
1900 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1901 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1902 2269
1903 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1904 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1905 $x = $lo if $x < $lo;
1906 $x = $hi - $page if $x > $hi - $page;
1907 $self->{range}[0] = $x;
1908 2272
1909 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1910 $self->update; 2274 $self->{knob_w} = $knob_w;
1911 } 2275 });
1912}
1913 2276
1914# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1915# so that the handle doesn't leave the texture. This calculation isn't 100%
1916# correct propably, but it does the job for now
1917sub _calc_inner_pad_px {
1918 my ($self, $w) = @_;
1919 ($w / 100) * $self->{inner_pad} # % to pixels
1920} 2278}
1921 2279
1922sub _draw { 2280sub _draw {
1923 my ($self) = @_; 2281 my ($self) = @_;
1924 2282
1925 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1926 2284
1927 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1928 2286
1929 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1930 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1931 2289
2290 glTranslate 1, 0, 0;
1932 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1933 glTranslate 0, -$self->{w}, 0;
1934
1935 ($w, $h) = ($h, $w);
1936 } 2292 }
1937 2293
1938 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1939 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1940 2296
1941 my ($value, $lo, $hi, $page) = @{$self->{range}};
1942
1943 $hi = $value + 1 if $lo == $hi;
1944
1945 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1946 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1947
1948 $page = int $page * $inner_w / ($hi - $lo);
1949 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1950
1951 $w -= $page;
1952 $page &= ~1;
1953 glTranslate $page * 0.5, 0, 0;
1954 $page ||= 2;
1955
1956 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1957 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963 2299
1964 # draw background 2300 # draw background
1965 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1966 2302
1967 # draw handle 2303 # draw handle
1968 $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);
1969 2305
1970 glDisable GL_BLEND;
1971 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1972} 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 (@_) }
1973 2349
1974############################################################################# 2350#############################################################################
1975 2351
1976package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1977 2353
… …
1986 fontsize => 1, 2362 fontsize => 1,
1987 can_events => 0, 2363 can_events => 0,
1988 #font => default_font 2364 #font => default_font
1989 @_, 2365 @_,
1990 2366
1991 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1992 par => [], 2368 par => [],
1993 height => 0, 2369 height => 0,
1994 children => [ 2370 children => [
1995 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1996 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1997 ], 2373 ],
1998 ); 2374 );
1999 2375
2000 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
2001 $self->update;
2002 });
2003 2377
2004 $self 2378 $self
2005} 2379}
2006 2380
2007sub set_fontsize { 2381sub set_fontsize {
2008 my ($self, $fontsize) = @_; 2382 my ($self, $fontsize) = @_;
2009 2383
2010 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2011 $self->reflow; 2385 $self->reflow;
2012}
2013
2014sub text_height {
2015 my ($self, $text) = @_;
2016
2017 my $layout = $self->{layout};
2018
2019 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2020 $layout->set_width ($self->{w});
2021 $layout->set_text ($text);
2022
2023 ($layout->size)[1]
2024}
2025
2026sub reflow {
2027 my ($self) = @_;
2028
2029 $self->{need_reflow}++;
2030 $self->update;
2031} 2386}
2032 2387
2033sub size_allocate { 2388sub size_allocate {
2034 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2035 2390
… …
2040 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2041 2396
2042 $self->reflow; 2397 $self->reflow;
2043} 2398}
2044 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
2045sub add_paragraph { 2434sub add_paragraph {
2046 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2047 2436
2048 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2049 2438 my ($w, $h) = $self->text_size ($line);
2050 my $height = $self->text_height ($text);
2051
2052 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2053 2442
2054 push @{$self->{par}}, [$height, $color, $text];
2055
2056 $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]);
2057 $self->{children}[1]->update;
2058} 2444}
2059 2445
2060sub update { 2446sub update {
2061 my ($self) = @_; 2447 my ($self) = @_;
2062 2448
… …
2064 2450
2065 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2066 2452
2067 delete $self->{texture}; 2453 delete $self->{texture};
2068 2454
2069 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2070 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2071 my $height = 0; 2459 my $height = 0;
2072 2460
2073 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2074 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 }
2075 2476
2076 $self->{height} = $height; 2477 $self->{height} = $height;
2077 2478
2078 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2079 2480
2080 delete $self->{texture}; 2481 delete $self->{texture};
2081 } 2482 }
2082 2483
2083 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2084 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2085 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2086 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
2087 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091
2092 my $top = int $self->{children}[1]{range}[0];
2093
2094 my $y0 = $top;
2095 my $y1 = $top + $self->{h};
2096
2097 my $y = 0;
2098
2099 my $layout = $self->{layout};
2100
2101 $layout->set_font ($self->{font}) if $self->{font};
2102 2502
2103 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2104 my $h = $par->[0]; 2504 my $h = $par->[1];
2105 2505
2106 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]);
2107 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2108 2510
2109 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2110 my ($W, $H) = $layout->size; 2512
2111 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;
2112 } 2515 }
2113 2516
2114 $y += $h; 2517 $y += $h;
2115 } 2518 }
2116 2519
2117 glDisable GL_TEXTURE_2D;
2118 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2119 }; 2521 };
2120 }); 2522 });
2121} 2523}
2122 2524
2123sub _draw { 2525sub _draw {
2124 my ($self) = @_; 2526 my ($self) = @_;
2125 2527
2126 if ($self->{texture}) {
2127 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2128 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2129 $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});
2130 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2131 }
2132 2533
2133 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2134 2535
2135} 2536}
2136 2537
… …
2184 2585
2185sub new { 2586sub new {
2186 my $class = shift; 2587 my $class = shift;
2187 2588
2188 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2189 state => 0, 2590 state => 0,
2190 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2191 @_ 2592 @_
2192 ); 2593 );
2193 2594
2194 if ($self->{state}) {
2195 $self->{state} = 0;
2196 $self->toggle_flopper;
2197 }
2198
2199 $self 2595 $self
2200} 2596}
2201 2597
2202sub toggle_flopper { 2598sub toggle_flopper {
2203 my ($self) = @_; 2599 my ($self) = @_;
2204 2600
2205 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2206 if ($self->{state} = !$self->{state}) {
2207 $CFClient::UI::ROOT->add ($self->{other});
2208 $self->{other}->move ($self->coord2global (0, $self->{h}));
2209 $self->emit ("open");
2210 } else {
2211 $CFClient::UI::ROOT->remove ($self->{other});
2212 $self->emit ("close");
2213 }
2214
2215 $self->emit (changed => $self->{state});
2216} 2602}
2217 2603
2218############################################################################# 2604#############################################################################
2219 2605
2220package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2230 @_, 2616 @_,
2231 can_events => 0, 2617 can_events => 0,
2232 ) 2618 )
2233} 2619}
2234 2620
2235sub set_markup { 2621sub set_tooltip_from {
2236 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2237 2623
2238 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2239 $self->{label}->set_markup ($text); 2625
2240 $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 );
2241} 2641}
2242 2642
2243sub size_request { 2643sub size_request {
2244 my ($self) = @_; 2644 my ($self) = @_;
2245
2246 $self->child->set_max_size ($::WIDTH * 0.3);
2247 2645
2248 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2249 2647
2250 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2251} 2649}
… …
2254 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2255 2653
2256 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2257} 2655}
2258 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
2259sub _draw { 2675sub _draw {
2260 my ($self) = @_; 2676 my ($self) = @_;
2261 2677
2262 glPushMatrix;
2263 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2264 2679
2265 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2266 2681
2267 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2278 glVertex 0 , $h; 2693 glVertex 0 , $h;
2279 glVertex $w, $h; 2694 glVertex $w, $h;
2280 glVertex $w, 0; 2695 glVertex $w, 0;
2281 glEnd; 2696 glEnd;
2282 2697
2283 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2284 2699
2285 glTranslate 2, 2;
2286 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2287} 2701}
2288 2702
2289############################################################################# 2703#############################################################################
2290 2704
… …
2295use CFClient::OpenGL; 2709use CFClient::OpenGL;
2296 2710
2297sub new { 2711sub new {
2298 my $class = shift; 2712 my $class = shift;
2299 2713
2300 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2301 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2302 @_, 2717 @_,
2303 ) 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
2304} 2735}
2305 2736
2306sub size_request { 2737sub size_request {
2307 (32, 8) 2738 (32, 8)
2308} 2739}
2309 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2310sub draw { 2749sub _draw {
2311 my ($self) = @_; 2750 my ($self) = @_;
2312 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
2313 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2314 2764
2315 if ($tex) { 2765 if ($tex) {
2316 glEnable GL_BLEND;
2317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2318 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2320 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2321 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2322 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2325} 2781}
2326 2782
2327############################################################################# 2783#############################################################################
2328 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
2329package CFClient::UI::Root; 3009package CFClient::UI::Root;
2330 3010
2331our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2332 3012
2333use CFClient::OpenGL; 3013use CFClient::OpenGL;
2334 3014
2335sub check_size { 3015sub new {
2336 my ($self) = @_; 3016 my $class = shift;
2337 3017
2338 $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
2339} 3026}
2340 3027
2341sub size_request { 3028sub size_request {
2342 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2343}
2344 3030
2345sub 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 {
2346 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2347 3050
2348 $self->SUPER::configure ($x, $y, $w, $h);
2349
2350 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2351 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)};
2352 3053
2353 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2354 $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
2355 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2356 } 3061 }
2357} 3062}
2358 3063
2359sub _topleft { 3064sub coord2local {
2360 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2361 3066
2362 ($x, $y) 3067 ($x, $y)
2363} 3068}
2364 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2365sub update { 3076sub update {
2366 my ($self) = @_; 3077 my ($self) = @_;
2367 3078
2368 $self->check_size; 3079 $::WANT_REFRESH++;
2369 ::refresh ();
2370} 3080}
2371 3081
2372sub add { 3082sub add {
2373 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2374 3084
2375 # integerize window positions 3085 $_->{is_toplevel} = 1
2376 $child->{x} = int $child->{x}; 3086 for @children;
2377 $child->{y} = int $child->{y};
2378 3087
2379 $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 }
2380} 3104}
2381 3105
2382sub on_refresh { 3106sub on_refresh {
2383 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2384 3108
2385 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2386} 3110}
2387 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2388sub draw { 3118sub draw {
2389 my ($self) = @_; 3119 my ($self) = @_;
2390 3120
2391 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2392 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2393 } 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
2394 3199
2395 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2396 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2397 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2398 3203
2399 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2400 glLoadIdentity; 3205 glLoadIdentity;
2401 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2402 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2403 glLoadIdentity; 3208 glLoadIdentity;
2404 3209
2405 $self->_draw; 3210 $self->_draw;
2406} 3211}
2407 3212
2408############################################################################# 3213#############################################################################
2409 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226 $vb->add (my $hb = new CFClient::UI::HBox);
3227 $hb->add (new CFClient::UI::Label text => "Key: ");
3228 $hb->add ($self->{keylbl} = new CFClient::UI::Label);
3229 $hb->add (new CFClient::UI::Button
3230 text => "bind",
3231 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3232 on_activate => sub {
3233 $self->ask_for_bind;
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3238 text => "start recording",
3239 tooltip => "Start/Stops recording of actions."
3240 ."All subsequent actions after the recording started will be captured."
3241 ."The actions are displayed after the record was stopped."
3242 ."To bind the action you have to click on the 'Bind' button",
3243 on_activate => sub {
3244 unless ($self->{recording}) {
3245 $self->start;
3246 } else {
3247 $self->stop;
3248 }
3249 });
3250
3251 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3252
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add (new CFClient::UI::Button
3255 text => "ok",
3256 tooltip => "This closes the binding editor and saves the binding",
3257 on_activate => sub {
3258 $self->hide;
3259 $self->commit;
3260 });
3261
3262 $hb->add (new CFClient::UI::Button
3263 text => "cancel",
3264 tooltip => "This closes the binding editor without saving",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->{binding_cancel}->()
3268 if $self->{binding_cancel};
3269 });
3270
3271 $self->update_binding_widgets;
3272
3273 $self
3274}
3275
3276sub commit {
3277 my ($self) = @_;
3278 my ($mod, $sym, $cmds) = $self->get_binding;
3279 if ($sym != 0 && @$cmds > 0) {
3280 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3281 ."'. Don't forget 'Save Config'!");
3282 $self->{binding_change}->($mod, $sym, $cmds)
3283 if $self->{binding_change};
3284 } else {
3285 $::STATUSBOX->add ("No action bound, no keys specified!");
3286 $self->{binding_cancel}->()
3287 if $self->{binding_cancel};
3288 }
3289}
3290
3291sub start {
3292 my ($self) = @_;
3293
3294 $self->{rec_btn}->set_text ("stop recording");
3295 $self->{recording} = 1;
3296 $self->clear_command_list;
3297 $::CONN->start_record if $::CONN;
3298}
3299
3300sub stop {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("start recording");
3304 $self->{recording} = 0;
3305
3306 my $rec;
3307 $rec = $::CONN->stop_record if $::CONN;
3308 return unless ref $rec eq 'ARRAY';
3309 $self->set_command_list ($rec);
3310}
3311
3312sub ask_for_bind {
3313 my ($self, $commit) = @_;
3314
3315 CFClient::Binder::open_binding_dialog (sub {
3316 my ($mod, $sym) = @_;
3317 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3318 $self->update_binding_widgets;
3319 $self->commit if $commit;
3320 });
3321}
3322
3323sub set_binding {
3324 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3325
3326 $self->clear_command_list;
3327 $self->{recording} = 0;
3328 $self->{rec_btn}->set_text ("start recording");
3329
3330 $self->{binding} = [$mod, $sym];
3331 $self->{commands} = $cmds;
3332
3333 $self->{binding_change} = $cb;
3334 $self->{binding_cancel} = $ccb;
3335
3336 $self->update_binding_widgets;
3337}
3338
3339sub update_binding_widgets {
3340 my ($self) = @_;
3341 my ($mod, $sym, $cmds) = $self->get_binding;
3342 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3343 $self->set_command_list ($cmds);
3344}
3345
3346sub get_binding {
3347 my ($self) = @_;
3348 return (
3349 $self->{binding}->[0],
3350 $self->{binding}->[1],
3351 [ grep { defined $_ } @{$self->{commands}} ]
3352 );
3353}
3354
3355sub clear_command_list {
3356 my ($self) = @_;
3357 $self->{cmdbox}->clear ();
3358}
3359
3360sub set_command_list {
3361 my ($self, $cmds) = @_;
3362
3363 $self->{cmdbox}->clear ();
3364 $self->{commands} = $cmds;
3365
3366 my $idx = 0;
3367
3368 for (@$cmds) {
3369 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3370
3371 my $i = $idx;
3372 $hb->add (new CFClient::UI::Button
3373 text => "delete",
3374 tooltip => "Deletes the action from the record",
3375 on_activate => sub {
3376 $self->{cmdbox}->remove ($hb);
3377 $cmds->[$i] = undef;
3378 });
3379
3380 $hb->add (new CFClient::UI::Label text => $_);
3381
3382 $idx++
3383 }
3384}
3385
3386
3387#############################################################################
3388
2410package CFClient::UI; 3389package CFClient::UI;
2411 3390
2412$ROOT = new CFClient::UI::Root; 3391$ROOT = new CFClient::UI::Root;
2413$TOOLTIP = new CFClient::UI::Tooltip; 3392$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2414 3393
24151 33941
2416 3395

Diff Legend

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