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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC

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

Diff Legend

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