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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 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 ();
8use Event;
7 9
8use CFClient; 10use CFClient;
11use CFClient::Texture;
9 12
10our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
11 14
15our $LAYOUT;
12our $ROOT; 16our $ROOT;
13our $TOOLTIP; 17our $TOOLTIP;
14our $BUTTON_STATE; 18our $BUTTON_STATE;
15 19
16sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17 if (!$GRAB) { 23 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
22 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
23 32
24 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
25 34
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 36
28 $TOOLTIP->set_markup ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 38 $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 } 39 }
40 40
41 return; 41 return;
42 } 42 }
43 } 43 }
44 } 44 }
45 45
46 $TOOLTIP->hide; 46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
66 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
67 90
68 $GRAB = $widget; 91 $GRAB = $widget;
69 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
70 93
71 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
136} 153}
137 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
190 }
191 }
192
193 reconfigure_widgets;
194}
195
138############################################################################# 196#############################################################################
139 197
140package CFClient::UI::Base; 198package CFClient::UI::Base;
141 199
142use strict; 200use strict;
… …
145 203
146sub new { 204sub new {
147 my $class = shift; 205 my $class = shift;
148 206
149 my $self = bless { 207 my $self = bless {
150 x => 0, 208 x => "center",
151 y => 0, 209 y => "center",
152 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
153 can_events => 1, 213 can_events => 1,
154 @_ 214 @_
155 }, $class; 215 }, $class;
156 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
157 for (keys %$self) { 219 for (keys %$self) {
158 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
160 } 222 }
161 } 223 }
162 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
163 $self 237 $self
164} 238}
165 239
166sub destroy { 240sub destroy {
167 my ($self) = @_; 241 my ($self) = @_;
… …
176 return if $self->{parent}; 250 return if $self->{parent};
177 251
178 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
179} 253}
180 254
181sub hide { 255sub set_visible {
182 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
183 279
184 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
186 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
238 }
239}
240 363
241sub size_allocate { 364 $self->{alloc_w} = $w;
242 # nothing to be done 365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
368 }
243} 369}
244 370
245sub children { 371sub children {
372 # nop
246} 373}
247 374
248# call when resolution changes etc. 375sub visible_children {
249sub reconfigure { 376 $_[0]->children
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 377}
259 378
260sub set_max_size { 379sub set_max_size {
261 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
262 381
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
386}
387
388sub set_tooltip {
389 my ($self, $tooltip) = @_;
390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
394 return if $self->{tooltip} eq $tooltip;
395
396 $self->{tooltip} = $tooltip;
397
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
401 }
265} 402}
266 403
267# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
268sub coord2local { 405sub coord2local {
269 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
… …
276 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
277 414
278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
279} 416}
280 417
281sub focus_in { 418sub invoke_focus_in {
282 my ($self) = @_; 419 my ($self) = @_;
283 420
284 return if $FOCUS == $self; 421 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
286 423
287 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
288 425
289 $self->emit (focus_in => $focus);
290
291 $focus->update if $focus; 426 $focus->update if $focus;
292 $FOCUS->update; 427 $FOCUS->update;
293}
294 428
429 0
430}
431
295sub focus_out { 432sub invoke_focus_out {
296 my ($self) = @_; 433 my ($self) = @_;
297 434
298 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
299 436
300 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
301 438
302 $self->emit (focus_out => $focus);
303
304 $focus->update if $focus; #? 439 $focus->update if $focus; #?
305}
306 440
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS;
443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
307sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
308sub button_up { } 454sub invoke_button_up { 1 }
309sub key_down { } 455sub invoke_key_down { 1 }
310sub key_up { } 456sub invoke_key_up { 1 }
311 457
312sub button_down { 458sub invoke_button_down {
313 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
314 460
315 $self->focus_in; 461 $self->grab_focus;
316}
317 462
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
322sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
480
481sub find_widget {
482 my ($self, $x, $y) = @_;
483
484 return () unless $self->{can_events};
485
486 return $self
487 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490 ()
491}
492
493sub set_parent {
494 my ($self, $parent) = @_;
495
496 Scalar::Util::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible};
498}
499
500sub realloc {
501 my ($self) = @_;
502
503 if ($self->{visible}) {
504 return if $self->{root}{realloc}{$self+0};
505
506 $self->{root}{realloc}{$self+0} = $self;
507 $self->{root}->update;
508 } else {
509 delete $self->{req_w};
510 delete $self->{req_h};
511 }
512}
513
514sub update {
515 my ($self) = @_;
516
517 $self->{parent}->update
518 if $self->{parent};
519}
520
521sub reconfigure {
522 my ($self) = @_;
523
524 $self->realloc;
525 $self->update;
526}
527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
323 531
324sub draw { 532sub draw {
325 my ($self) = @_; 533 my ($self) = @_;
326 534
327 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
328 546
329 glPushMatrix; 547 glPushMatrix;
330 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
331 $self->_draw;
332 glPopMatrix;
333 549
334 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
335 my ($x, $y) = @$self{qw(x y)};
336
337 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
338 glEnable GL_BLEND; 552 glEnable GL_BLEND;
339 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
340 glBegin GL_QUADS; 554 glBegin GL_QUADS;
341 glVertex $x , $y;
342 glVertex $x + $self->{w}, $y;
343 glVertex $x + $self->{w}, $y + $self->{h};
344 glVertex $x , $y + $self->{h};
345 glEnd;
346 glDisable GL_BLEND;
347 }
348
349 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix;
351 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 555 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 556 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 557 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 558 glVertex 0 , $self->{h};
358 glEnd; 559 glEnd;
560 glDisable GL_BLEND;
561 }
562
563 if ($ENV{CFPLUS_DEBUG} & 1) {
564 glPushMatrix;
565 glColor 1, 1, 0, 1;
566 glTranslate 0.375, 0.375;
567 glBegin GL_LINE_LOOP;
568 glVertex 0 , 0;
569 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1;
572 glEnd;
359 glPopMatrix; 573 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
362} 579}
363 580
364sub _draw { 581sub _draw {
365 my ($self) = @_; 582 my ($self) = @_;
366 583
367 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
368} 585}
369 586
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
389}
390
391sub check_size {
392 my ($self) = @_;
393
394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395}
396
397sub update {
398 my ($self) = @_;
399
400 $self->{parent}->update
401 if $self->{parent};
402}
403
404sub connect {
405 my ($self, $signal, $cb) = @_;
406
407 push @{ $self->{signal_cb}{$signal} }, $cb;
408}
409
410sub emit {
411 my ($self, $signal, @args) = @_;
412
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
414}
415
416sub DESTROY { 587sub DESTROY {
417 my ($self) = @_; 588 my ($self) = @_;
418 589
419 #$self->deactivate; 590 delete $WIDGET{$self+0};
591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
420} 594}
421 595
422############################################################################# 596#############################################################################
423 597
424package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
432 my $class = shift; 606 my $class = shift;
433 607
434 # range [value, low, high, page] 608 # range [value, low, high, page]
435 609
436 $class->SUPER::new ( 610 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 611 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 612 #active_bg => [1, 1, 1, 0.5],
439 @_ 613 @_
440 ) 614 )
441} 615}
442 616
443sub _draw { 617sub _draw {
444 my ($self) = @_; 618 my ($self) = @_;
445 619
620 my $color = $FOCUS == $self && $self->{active_bg}
621 ? $self->{active_bg}
622 : $self->{bg};
623
624 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
447 626
448 glEnable GL_BLEND; 627 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 629 glColor_premultiply @$color;
451 630
452 glBegin GL_QUADS; 631 glBegin GL_QUADS;
453 glVertex 0 , 0; 632 glVertex 0 , 0;
454 glVertex 0 , $h; 633 glVertex 0 , $h;
455 glVertex $w, $h; 634 glVertex $w, $h;
456 glVertex $w, 0; 635 glVertex $w, 0;
457 glEnd; 636 glEnd;
458 637
459 glDisable GL_BLEND; 638 glDisable GL_BLEND;
639 }
460} 640}
461 641
462############################################################################# 642#############################################################################
463 643
464package CFClient::UI::Empty; 644package CFClient::UI::Empty;
… …
469 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
470 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
471} 651}
472 652
473sub size_request { 653sub size_request {
474 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
475} 657}
476 658
477sub draw { } 659sub draw { }
478 660
479############################################################################# 661#############################################################################
… …
483our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
484 666
485sub new { 667sub new {
486 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
487 669
488 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
489 671
490 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
491 children => [], 673 children => [],
492 can_events => 0, 674 can_events => 0,
493 %arg, 675 %arg,
494 ); 676 );
677
495 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
496 680
497 $self 681 $self
498} 682}
499 683
500sub add { 684sub add {
… …
508 $self->{children} = [ 692 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 693 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 694 @{$self->{children}}, @widgets
511 ]; 695 ];
512 696
513 $self->check_size; 697 $self->realloc;
514 $self->update;
515} 698}
516 699
517sub children { 700sub children {
518 @{ $_[0]{children} } 701 @{ $_[0]{children} }
519} 702}
… …
524 delete $child->{parent}; 707 delete $child->{parent};
525 $child->hide; 708 $child->hide;
526 709
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 711
529 $self->check_size; 712 $self->realloc;
530 $self->update;
531} 713}
532 714
533sub clear { 715sub clear {
534 my ($self) = @_; 716 my ($self) = @_;
535 717
… …
539 for (@$children) { 721 for (@$children) {
540 delete $_->{parent}; 722 delete $_->{parent};
541 $_->hide; 723 $_->hide;
542 } 724 }
543 725
544 $self->check_size; 726 $self->realloc;
545 $self->update;
546} 727}
547 728
548sub find_widget { 729sub find_widget {
549 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
550 731
551 $x -= $self->{x}; 732 $x -= $self->{x};
552 $y -= $self->{y}; 733 $y -= $self->{y};
553 734
554 my $res; 735 my $res;
555 736
556 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
557 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
558 and return $res; 739 and return $res;
559 } 740 }
560 741
561 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
582} 763}
583 764
584sub add { 765sub add {
585 my ($self, $child) = @_; 766 my ($self, $child) = @_;
586 767
587 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
588
589 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
590} 770}
591 771
592sub remove { 772sub remove {
593 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
602 782
603sub size_request { 783sub size_request {
604 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
605} 785}
606 786
607sub size_allocate { 787sub invoke_size_allocate {
608 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
609 789
610 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
611} 793}
612 794
613############################################################################# 795#############################################################################
796
797# back-buffered drawing area
614 798
615package CFClient::UI::Window; 799package CFClient::UI::Window;
616 800
617our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
618 802
… …
625} 809}
626 810
627sub update { 811sub update {
628 my ($self) = @_; 812 my ($self) = @_;
629 813
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 815 $self->SUPER::update;
632} 816}
633 817
634sub size_allocate { 818sub invoke_size_allocate {
635 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
636 820
637 $self->SUPER::size_allocate ($w, $h);
638 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
639} 824}
640 825
641sub _render { 826sub _render {
827 my ($self) = @_;
828
642 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
643} 830}
644 831
645sub render_child { 832sub render_child {
646 my ($self) = @_; 833 my ($self) = @_;
647 834
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
651 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
652 $self->_render; 846 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 847 };
661} 848}
662 849
663sub _draw { 850sub _draw {
664 my ($self) = @_; 851 my ($self) = @_;
665 852
666 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
667 854
668 my $tex = $self->{texture} 855 my $tex = $self->{texture}
669 or return; 856 or return;
670 857
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 860 glColor 0, 0, 0, 1;
676 861
677 $tex->draw_quad (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 863
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
681} 865}
682 866
683############################################################################# 867#############################################################################
684 868
685package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
686 870
687our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
688 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
689sub size_request { 883sub size_request {
690 my ($self) = @_; 884 my ($self) = @_;
691 885
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 887
695 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
696} 889 $h = 10 if $self->{scroll_y};
697 890
891 ($w, $h)
892}
893
698sub size_allocate { 894sub invoke_size_allocate {
699 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
700 896
897 my $child = $self->child;
898
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901
902 $self->child->configure (0, 0, $w, $h);
701 $self->update; 903 $self->update;
904
905 1
702} 906}
703 907
704sub set_offset { 908sub set_offset {
705 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
706 910
… …
739} 943}
740 944
741sub _render { 945sub _render {
742 my ($self) = @_; 946 my ($self) = @_;
743 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 952
746 $self->SUPER::_render; 953 $self->SUPER::_render;
747} 954}
748 955
749############################################################################# 956#############################################################################
750 957
751package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
752 959
753our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
961
962sub new {
963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
966
967 my $self;
968
969 my $slider = new CFClient::UI::Slider
970 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]);
974 },
975 ;
976
977 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1),
979 slider => $slider,
980 %arg,
981 );
982
983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
985
986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_;
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1012}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017#############################################################################
1018
1019package CFClient::UI::Frame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
754 1024
755sub new { 1025sub new {
756 my $class = shift; 1026 my $class = shift;
757 1027
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new ( 1028 $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 1029 bg => undef,
770 slider => $slider,
771 @_, 1030 @_,
1031 )
1032}
1033
1034sub _draw {
1035 my ($self) = @_;
1036
1037 if ($self->{bg}) {
1038 my ($w, $h) = @$self{qw(w h)};
1039
1040 glEnable GL_BLEND;
1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1042 glColor_premultiply @{ $self->{bg} };
1043
1044 glBegin GL_QUADS;
1045 glVertex 0 , 0;
1046 glVertex 0 , $h;
1047 glVertex $w, $h;
1048 glVertex $w, 0;
1049 glEnd;
1050
1051 glDisable GL_BLEND;
1052 }
1053
1054 $self->SUPER::_draw;
1055}
1056
1057#############################################################################
1058
1059package CFClient::UI::FancyFrame;
1060
1061our @ISA = CFClient::UI::Bin::;
1062
1063use CFClient::OpenGL;
1064
1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072
1073sub new {
1074 my ($class, %arg) = @_;
1075
1076 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1],
1079 border => 0.6,
1080 can_events => 1,
1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
772 ); 1084 );
773 1085
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 my $self = $class->SUPER::new (
796 bg => [1, 1, 1, 1],
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_
800 );
801
802 $self
803}
804
805sub _draw {
806 my ($self) = @_;
807
808 my ($w, $h) = ($self->{w}, $self->{h});
809
810 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814
815# glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0;
818# glVertex 0 , $h;
819# glVertex $w, $h;
820# glVertex $w, 0;
821# glEnd;
822
823
824 $self->child->draw;
825 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D;
827}
828
829#############################################################################
830
831package CFClient::UI::FancyFrame;
832
833our @ISA = CFClient::UI::Bin::;
834
835use CFClient::OpenGL;
836
837my @tex =
838 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
839 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
840
841sub new {
842 my $class = shift;
843
844 # TODO: user_x, user_y, overwrite moveto?
845
846 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1],
849 border => 0.6,
850 can_events => 1,
851 @_
852 );
853
854 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
855 align => 0, 1087 align => 0,
856 valign => 1, 1088 valign => 1,
857 text => $self->{title}, 1089 text => $self->{title},
858 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
859 1101
860 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
861} 1111}
862 1112
863sub border { 1113sub border {
864 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
865} 1115}
866 1116
867sub size_request { 1117sub size_request {
868 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
869 1125
870 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
871 1127
872 ( 1128 (
873 $w + $self->border * 2, 1129 $w + $self->border * 2,
874 $h + $self->border * 2, 1130 $h + $self->border * 2,
875 ) 1131 )
876} 1132}
877 1133
878sub size_allocate { 1134sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
880 1136
1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1142
1143 my $border = $self->border;
1144
881 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
883 1147
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
885 if $self->{title};
886
887 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
888}
889 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
890sub button_down { 1156sub invoke_button_down {
891 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
892 1158
893 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
894 my $border = $self->border; 1160 my $border = $self->border;
895 1161
… …
908 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
909 1175
910 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
912 1178
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
916 $self->check_size; 1183 $self->realloc;
917 }; 1184 };
918 1185
919 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1190 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
925 1192
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
927 1194
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
929 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
930 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
931 } 1203 1
932} 1204}
933 1205
934sub button_up { 1206sub invoke_button_up {
935 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
936 1208
937 delete $self->{motion}; 1209 ! ! delete $self->{motion}
938} 1210}
939 1211
940sub mouse_motion { 1212sub invoke_mouse_motion {
941 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
942 1214
943 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
944} 1218}
945 1219
946sub _draw { 1220sub _draw {
947 my ($self) = @_; 1221 my ($self) = @_;
948 1222
1223 my $child = $self->{children}[0];
1224
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
951 1227
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1230
957 my $border = $self->border; 1231 my $border = $self->border;
958 1232
959 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1238
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
967 1241
968 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
969 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
970 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
971
972 glColor @{ $self->{bg} };
973
974 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1247 }
978 1248
979 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1250
983 $self->{title}->draw if $self->{title};
984
985 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
986} 1262}
987 1263
988############################################################################# 1264#############################################################################
989 1265
990package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
998sub new { 1274sub new {
999 my $class = shift; 1275 my $class = shift;
1000 1276
1001 $class->SUPER::new ( 1277 $class->SUPER::new (
1002 col_expand => [], 1278 col_expand => [],
1003 @_ 1279 @_,
1004 ) 1280 )
1281}
1282
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1285}
1006 1286
1007sub add { 1287sub add {
1008 my ($self, $x, $y, $child) = @_; 1288 my ($self, $x, $y, $child) = @_;
1009 1289
1010 $child->set_parent ($self); 1290 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1012 1292
1013 $child->check_size; 1293 $self->realloc;
1014} 1294}
1015 1295
1016sub children { 1296sub remove {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1297 my ($self, $child) = @_;
1018}
1019 1298
1299 # TODO: not yet implemented
1300}
1301
1020# TODO: move to container class maybe? send childs a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1303sub clear {
1022 my ($self) = @_; 1304 my ($self) = @_;
1023 1305
1024 my @children = $self->children; 1306 my @children = $self->children;
1025 delete $self->{children}; 1307 delete $self->{children};
… …
1027 for (@children) { 1309 for (@children) {
1028 delete $_->{parent}; 1310 delete $_->{parent};
1029 $_->hide; 1311 $_->hide;
1030 } 1312 }
1031 1313
1032 $self->update; 1314 $self->realloc;
1033} 1315}
1034 1316
1035sub get_wh { 1317sub get_wh {
1036 my ($self) = @_; 1318 my ($self) = @_;
1037 1319
… …
1063 (sum @$ws), 1345 (sum @$ws),
1064 (sum @$hs), 1346 (sum @$hs),
1065 ) 1347 )
1066} 1348}
1067 1349
1068sub size_allocate { 1350sub invoke_size_allocate {
1069 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1070 1352
1071 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1072 1354
1073 my $req_w = sum @$ws; 1355 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1356 my $req_h = (sum @$hs) || 1;
1075 1357
1076 # TODO: nicer code && do row_expand 1358 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1359 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1360 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1361 my $col_expand = (sum @col_expand) || 1;
… …
1105 } 1387 }
1106 1388
1107 $y += $row_h; 1389 $y += $row_h;
1108 } 1390 }
1109 1391
1392 1
1110} 1393}
1111 1394
1112sub find_widget { 1395sub find_widget {
1113 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1114 1397
… …
1133 } 1416 }
1134} 1417}
1135 1418
1136############################################################################# 1419#############################################################################
1137 1420
1421package CFClient::UI::Box;
1422
1423our @ISA = CFClient::UI::Container::;
1424
1425sub size_request {
1426 my ($self) = @_;
1427
1428 $self->{vertical}
1429 ? (
1430 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1431 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1432 )
1433 : (
1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1436 )
1437}
1438
1439sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 my $space = $self->{vertical} ? $h : $w;
1443 my @children = $self->visible_children;
1444
1445 my @req;
1446
1447 if ($self->{homogeneous}) {
1448 @req = ($space / (@children || 1)) x @children;
1449 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req;
1452
1453 if ($req > $space) {
1454 # ah well, not enough space
1455 $_ *= $space / $req for @req;
1456 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458
1459 $space = ($space - $req) / $expand; # remaining space to give away
1460
1461 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#children;
1463 }
1464 }
1465
1466 CFClient::UI::harmonize \@req;
1467
1468 my $pos = 0;
1469 for (0 .. $#children) {
1470 my $alloc = $req[$_];
1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472
1473 $pos += $alloc;
1474 }
1475
1476 1
1477}
1478
1479#############################################################################
1480
1138package CFClient::UI::HBox; 1481package CFClient::UI::HBox;
1139 1482
1140# TODO: wrap into common Box base class
1141
1142our @ISA = CFClient::UI::Container::; 1483our @ISA = CFClient::UI::Box::;
1143 1484
1144sub size_request { 1485sub new {
1145 my ($self) = @_; 1486 my $class = shift;
1146 1487
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1488 $class->SUPER::new (
1148 1489 vertical => 0,
1149 ( 1490 @_,
1150 (List::Util::sum map $_->[0], @alloc),
1151 (List::Util::max map $_->[1], @alloc),
1152 ) 1491 )
1153} 1492}
1154 1493
1155sub size_allocate {
1156 my ($self, $w, $h) = @_;
1157
1158 ($h, $w) = ($w, $h);
1159
1160 my $children = $self->{children};
1161
1162 my @h = map $_->{req_w}, @$children;
1163
1164 my $req_h = List::Util::sum @h;
1165
1166 if ($req_h > $h) {
1167 # ah well, not enough space
1168 $_ *= $h / $req_h for @h;
1169 } else {
1170 my $exp = List::Util::sum map $_->{expand}, @$children;
1171 $exp ||= 1;
1172
1173 for (0 .. $#$children) {
1174 my $child = $children->[$_];
1175
1176 my $alloc_h = $h[$_];
1177 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1178 $h[$_] = $alloc_h;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure ($y, 0, $h, $w);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1494#############################################################################
1197 1495
1198package CFClient::UI::VBox; 1496package CFClient::UI::VBox;
1199 1497
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1498our @ISA = CFClient::UI::Box::;
1203 1499
1204sub size_request { 1500sub new {
1205 my ($self) = @_; 1501 my $class = shift;
1206 1502
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1503 $class->SUPER::new (
1208 1504 vertical => 1,
1209 ( 1505 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1506 )
1213} 1507}
1214 1508
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1219
1220 my $children = $self->{children};
1221
1222 my @h = map $_->{req_h}, @$children;
1223
1224 my $req_h = List::Util::sum @h;
1225
1226 if ($req_h > $h) {
1227 # ah well, not enough space
1228 $_ *= $h / $req_h for @h;
1229 } else {
1230 my $exp = List::Util::sum map $_->{expand}, @$children;
1231 $exp ||= 1;
1232
1233 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235
1236 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1237 }
1238 }
1239
1240 CFClient::UI::harmonize \@h;
1241
1242 my $y = 0;
1243 for (0 .. $#$children) {
1244 my $child = $children->[$_];
1245 my $h = $h[$_];
1246 $child->configure (0, $y, $w, $h);
1247
1248 $y += $h;
1249 }
1250
1251 1
1252}
1253
1254############################################################################# 1509#############################################################################
1255 1510
1256package CFClient::UI::Label; 1511package CFClient::UI::Label;
1257 1512
1258our @ISA = CFClient::UI::Base::; 1513our @ISA = CFClient::UI::DrawBG::;
1259 1514
1260use CFClient::OpenGL; 1515use CFClient::OpenGL;
1261 1516
1262sub new { 1517sub new {
1263 my ($class, %arg) = @_; 1518 my ($class, %arg) = @_;
1264 1519
1265 my $self = $class->SUPER::new ( 1520 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1521 fg => [1, 1, 1],
1522 #bg => none
1523 #active_bg => none
1267 #font => default_font 1524 #font => default_font
1525 #text => initial text
1526 #markup => initial narkup
1527 #max_w => maximum pixel width
1528 ellipsise => 3, # end
1529 layout => (new CFClient::Layout),
1268 fontsize => 1, 1530 fontsize => 1,
1269 text => "",
1270 align => -1, 1531 align => -1,
1271 valign => -1, 1532 valign => -1,
1272 padding => 2, 1533 padding_x => 2,
1273 layout => new CFClient::Layout, 1534 padding_y => 2,
1274 can_events => 0, 1535 can_events => 0,
1275 %arg 1536 %arg
1276 ); 1537 );
1277 1538
1278 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1540 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1541 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1542 $self->{template} = $layout;
1282 } 1543 }
1283 1544
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1545 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1546 $self->set_markup (delete $self->{markup});
1547 } else {
1548 $self->set_text (delete $self->{text});
1549 }
1286 1550
1287 $self 1551 $self
1288} 1552}
1289 1553
1290sub escape { 1554sub escape($) {
1291 local $_ = $_[1]; 1555 local $_ = $_[0];
1292 1556
1293 s/&/&amp;/g; 1557 s/&/&amp;/g;
1294 s/>/&gt;/g; 1558 s/>/&gt;/g;
1295 s/</&lt;/g; 1559 s/</&lt;/g;
1296 1560
1297 $_[1] 1561 $_
1298} 1562}
1299 1563
1300sub update { 1564sub update {
1301 my ($self) = @_; 1565 my ($self) = @_;
1302 1566
1303 delete $self->{texture}; 1567 delete $self->{texture};
1304 $self->SUPER::update; 1568 $self->SUPER::update;
1305} 1569}
1306 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1307sub set_text { 1578sub set_text {
1308 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1309 1580
1310 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1312 1583
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1314 1586
1587 delete $self->{size_req};
1588 $self->realloc;
1315 $self->update; 1589 $self->update;
1316 $self->check_size;
1317} 1590}
1318 1591
1319sub set_markup { 1592sub set_markup {
1320 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1321 1594
1322 return if $self->{text} eq "M$markup"; 1595 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1596 $self->{text} = "M$markup";
1324 1597
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1326 1602
1603 delete $self->{size_req};
1604 $self->realloc;
1327 $self->update; 1605 $self->update;
1328 $self->check_size;
1329} 1606}
1330 1607
1331sub size_request { 1608sub size_request {
1332 my ($self) = @_; 1609 my ($self) = @_;
1333 1610
1611 $self->{size_req} ||= do {
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1617
1338 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1339 1619
1340 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1623
1344 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1345 1625
1346 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1348 } 1631 };
1349 1632
1350 ( 1633 @{ $self->{size_req} }
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1634}
1355 1635
1356sub size_allocate { 1636sub invoke_size_allocate {
1357 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1358 1638
1639 delete $self->{ox};
1640
1359 delete $self->{texture}; 1641 delete $self->{texture}
1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1360} 1645}
1361 1646
1362sub set_fontsize { 1647sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1364 1649
1365 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1651 delete $self->{texture};
1367 1652
1368 $self->update; 1653 $self->realloc;
1369 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1370} 1662}
1371 1663
1372sub _draw { 1664sub _draw {
1373 my ($self) = @_; 1665 my ($self) = @_;
1374 1666
1667 $self->SUPER::_draw; # draw background, if applicable
1668
1375 my $tex = $self->{texture} ||= do { 1669 my $tex = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1671 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676
1379 new_from_layout CFClient::Texture $self->{layout} 1677 new_from_layout CFClient::Texture $self->{layout}
1380 }; 1678 };
1381 1679
1382 glEnable GL_BLEND; 1680 unless (exists $self->{ox}) {
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5);
1684
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5);
1688 };
1689
1384 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1694
1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1387 glColor @{$self->{fg}}; 1702 }
1388
1389 $self->{ox} = int (
1390 $self->{align} < 0 ? $self->{padding}
1391 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392 : ($self->{w} - $tex->{w}) * 0.5
1393 );
1394
1395 $self->{oy} = int (
1396 $self->{valign} < 0 ? $self->{padding}
1397 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398 : ($self->{h} - $tex->{h}) * 0.5
1399 );
1400
1401 $tex->draw_quad ($self->{ox}, $self->{oy});
1402 1703
1403 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1705}
1406 1706
1407############################################################################# 1707#############################################################################
1408 1708
1409package CFClient::UI::EntryBase; 1709package CFClient::UI::EntryBase;
… …
1422 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1423 can_hover => 1, 1723 can_hover => 1,
1424 can_focus => 1, 1724 can_focus => 1,
1425 valign => 0, 1725 valign => 0,
1426 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1427 @_ 1729 @_
1428 ) 1730 )
1429} 1731}
1430 1732
1431sub _set_text { 1733sub _set_text {
… …
1433 1735
1434 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1435 1737
1436 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1437 1739
1438 delete $self->{texture};
1439
1440 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1441 $self->{text} = $text; 1741 $self->{text} = $text;
1442 1742
1443 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1445 1746
1446 $self->emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1751}
1752
1753sub set_text {
1754 my ($self, $text) = @_;
1755
1756 $self->{cursor} = length $text;
1757 $self->_set_text ($text);
1447} 1758}
1448 1759
1449sub get_text { 1760sub get_text {
1450 $_[0]{text} 1761 $_[0]{text}
1451} 1762}
… …
1456 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1457 1768
1458 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1459} 1770}
1460 1771
1461sub size_allocate {
1462 my ($self, $w, $h) = @_;
1463
1464 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465}
1466
1467sub set_text {
1468 my ($self, $text) = @_;
1469
1470 $self->{cursor} = length $text;
1471 $self->_set_text ($text);
1472 $self->update;
1473}
1474
1475sub key_down { 1772sub invoke_key_down {
1476 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1477 1774
1478 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1479 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
1481 1778
1482 my $text = $self->get_text; 1779 my $text = $self->get_text;
1483 1780
1484 if ($sym == 8) { 1781 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1783 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1784 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1785 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1786 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1787 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1788 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1793 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1794 $self->emit ('escape');
1498 } elsif ($uni) { 1795 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1500 } 1799 }
1501 1800
1502 $self->_set_text ($text); 1801 $self->_set_text ($text);
1503 $self->update;
1504}
1505 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1506sub focus_in { 1808sub invoke_focus_in {
1507 my ($self) = @_; 1809 my ($self) = @_;
1508 1810
1509 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1510 1812
1511 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1512} 1814}
1513 1815
1514sub button_down { 1816sub invoke_button_down {
1515 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1516 1818
1517 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1518 1820
1519 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1520 1822
1521 # byte-index to char-index 1823 # byte-index to char-index
1522 my $text = $self->{text}; 1824 my $text = $self->{text};
1523 utf8::encode $text; 1825 utf8::encode $text;
1524 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1525 1827
1526 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1527 $self->update; 1829 $self->update;
1830
1831 1
1528} 1832}
1529 1833
1530sub mouse_motion { 1834sub invoke_mouse_motion {
1531 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1532# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1533} 1839}
1534 1840
1535sub _draw { 1841sub _draw {
1536 my ($self) = @_; 1842 my ($self) = @_;
1537 1843
1538 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1539 1845
1540 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1541 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1542 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1543 } else { 1849 } else {
1544 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1545 } 1851 }
1546 1852
1547 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1548 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1549 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1550 glVertex 0 , 0; 1856 glVertex 0 , 0;
1551 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1552 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1553 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1578 1884
1579our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1580 1886
1581use CFClient::OpenGL; 1887use CFClient::OpenGL;
1582 1888
1583sub key_down { 1889sub invoke_key_down {
1584 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1585 1891
1586 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1587 1893
1588 if ($sym == 13) { 1894 if ($sym == 13) {
1589 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1590 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1591 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1592 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1593 $self->emit (activate => $txt); 1900 $self->emit (activate => $txt);
1594 $self->update; 1901 $self->update;
1595 1902
… …
1614 } else { 1921 } else {
1615 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1616 } 1923 }
1617 1924
1618 } else { 1925 } else {
1619 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1620 } 1929 1
1621
1622} 1930}
1623 1931
1624############################################################################# 1932#############################################################################
1625 1933
1626package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1635 1943
1636sub new { 1944sub new {
1637 my $class = shift; 1945 my $class = shift;
1638 1946
1639 $class->SUPER::new ( 1947 $class->SUPER::new (
1640 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1641 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1644 can_hover => 1, 1952 can_hover => 1,
1645 align => 0, 1953 align => 0,
1646 valign => 0, 1954 valign => 0,
1647 can_events => 1, 1955 can_events => 1,
1648 @_ 1956 @_
1649 ) 1957 )
1650} 1958}
1651 1959
1652sub button_up { 1960sub invoke_button_up {
1653 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1654 1962
1963 $self->emit ("activate")
1655 if ($x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1656 && $y >= 0 && $y < $self->{h}) { 1965 && $y >= 0 && $y < $self->{h};
1657 $self->emit ("activate"); 1966
1658 } 1967 1
1659} 1968}
1660 1969
1661sub _draw { 1970sub _draw {
1662 my ($self) = @_; 1971 my ($self) = @_;
1663 1972
1664 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1665 1974
1666 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg};
1668 }
1669
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1675 1978
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1980
1678 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1982
1681 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1682} 2020}
1683 2021
1684############################################################################# 2022#############################################################################
1685 2023
1686package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1695 2033
1696sub new { 2034sub new {
1697 my $class = shift; 2035 my $class = shift;
1698 2036
1699 $class->SUPER::new ( 2037 $class->SUPER::new (
1700 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1701 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1702 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
2042 bg => [0, 0, 0, 0.2],
2043 active_bg => [1, 1, 1, 0.5],
1703 state => 0, 2044 state => 0,
1704 can_hover => 1, 2045 can_hover => 1,
1705 @_ 2046 @_
1706 ) 2047 )
1707} 2048}
1708 2049
1709sub size_request { 2050sub size_request {
1710 my ($self) = @_; 2051 my ($self) = @_;
1711 2052
1712 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1713} 2054}
1714 2055
1715sub button_down { 2056sub invoke_button_down {
1716 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1717 2058
1718 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1719 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1720 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1721 $self->emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1722 } 2067 1
1723} 2068}
1724 2069
1725sub _draw { 2070sub _draw {
1726 my ($self) = @_; 2071 my ($self) = @_;
1727 2072
1728 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1729 2074
1730 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1731 2076
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1733 2080
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 2082
1736 glEnable GL_BLEND; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
1737 glEnable GL_TEXTURE_2D; 2085 glEnable GL_TEXTURE_2D;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740 my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742 $tex->draw_quad (0, 0, $s, $s); 2086 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 2087 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 2088}
1747 2089
1748############################################################################# 2090#############################################################################
1749 2091
1750package CFClient::UI::Image; 2092package CFClient::UI::Image;
1751 2093
1752our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1753 2095
1754use CFClient::OpenGL; 2096use CFClient::OpenGL;
1755use Carp qw/confess/;
1756 2097
1757our %loaded_images; 2098our %texture_cache;
1758 2099
1759sub new { 2100sub new {
1760 my $class = shift; 2101 my $class = shift;
1761 2102
1762 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
1763 2107
1764 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
1765 2110
1766 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
1767 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1768 2113
1769 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
1770 2115
1771 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1772
1773 $self->{aspect} = $tex->{w} / $tex->{h};
1774 2117
1775 $self 2118 $self
1776} 2119}
1777 2120
1778sub size_request { 2121sub size_request {
1779 my ($self) = @_; 2122 my ($self) = @_;
1780 2123
1781 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
1782} 2125}
1783 2126
1784sub _draw { 2127sub _draw {
1785 my ($self) = @_; 2128 my ($self) = @_;
1786 2129
… …
1793 glTranslate 0, -$self->{w}, 0; 2136 glTranslate 0, -$self->{w}, 0;
1794 2137
1795 ($w, $h) = ($h, $w); 2138 ($w, $h) = ($h, $w);
1796 } 2139 }
1797 2140
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 2141 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 2143
1803 $tex->draw_quad (0, 0, $w, $h); 2144 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 2145
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 2146 glDisable GL_TEXTURE_2D;
1807} 2147}
1808 2148
1809############################################################################# 2149#############################################################################
1810 2150
… …
1900 2240
1901 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
1902 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
1903 2243
1904 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
1905 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1906 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1908 2249
1909 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
1910 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2340 qw(s1_slider.png s1_slider_bg.png);
2000 2341
2001sub new { 2342sub new {
2002 my $class = shift; 2343 my $class = shift;
2003 2344
2004 # range [value, low, high, page] 2345 # range [value, low, high, page, unit]
2005 2346
2006 # TODO: 0-width page 2347 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2348 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2349 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2350 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2351 fg => [1, 1, 1],
2011 active_fg => [0, 0, 0], 2352 active_fg => [0, 0, 0],
2353 bg => [0, 0, 0, 0.2],
2354 active_bg => [1, 1, 1, 0.5],
2012 range => [0, 0, 100, 10], 2355 range => [0, 0, 100, 10, 0],
2013 req_w => $::WIDTH / 80, 2356 min_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2357 min_h => $::WIDTH / 80,
2015 vertical => 0, 2358 vertical => 0,
2016 can_hover => 1, 2359 can_hover => 1,
2017 inner_pad => 5, 2360 inner_pad => 0.02,
2018 @_ 2361 @_
2019 ); 2362 );
2020 2363
2364 $self->set_value ($self->{range}[0]);
2365 $self->update;
2366
2021 $self 2367 $self
2022} 2368}
2023 2369
2370sub set_range {
2371 my ($self, $range) = @_;
2372
2373 ($range, $self->{range}) = ($self->{range}, $range);
2374
2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2379}
2380
2381sub set_value {
2382 my ($self, $value) = @_;
2383
2384 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2385
2386 $hi = $lo + 1 if $hi <= $lo;
2387
2388 $page = $hi - $lo if $page > $hi - $lo;
2389
2390 $value = $lo if $value < $lo;
2391 $value = $hi - $page if $value > $hi - $page;
2392
2393 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2394 if $unit;
2395
2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2397
2398 if ($value != $old_value) {
2399 $self->emit (changed => $value);
2400 $self->update;
2401 }
2402}
2403
2024sub size_request { 2404sub size_request {
2025 my ($self) = @_; 2405 my ($self) = @_;
2026 2406
2027 my $w = $self->{req_w}; 2407 ($self->{req_w}, $self->{req_h})
2028 my $h = $self->{req_h};
2029
2030 $self->{vertical} ? ($h, $w) : ($w, $h)
2031} 2408}
2032 2409
2033sub button_down { 2410sub invoke_button_down {
2034 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2035 2412
2036 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2414
2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2416
2037 $self->mouse_motion ($ev, $x, $y); 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2038} 2418}
2039 2419
2040sub mouse_motion { 2420sub invoke_mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2042 2422
2043 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2425
2426 my (undef, $lo, $hi, $page) = @{$self->{range}};
2427
2428 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2429
2430 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431 } else {
2432 return 0;
2433 }
2434
2435 1
2436}
2437
2438sub update {
2439 my ($self) = @_;
2440
2441 delete $self->{knob_w};
2442 $self->SUPER::update;
2443}
2444
2445sub _draw {
2446 my ($self) = @_;
2447
2448 unless ($self->{knob_w}) {
2449 $self->set_value ($self->{range}[0]);
2450
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2452 my $range = ($hi - $page - $lo) || 1e-100;
2045 2453
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047 2455
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2456 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2457 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050 2458
2051 $x -= $inner_pad_px; # substract the padding 2459 $value = ($value - $lo) / $range;
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2460 $value = $value * $self->{scale} + $self->{offset};
2053 $x = $lo if $x < $lo;
2054 $x = $hi - $page if $x > $hi - $page;
2055 $self->{range}[0] = $x;
2056 2461
2057 $self->emit (changed => $x); 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2058 $self->update; 2463 $self->{knob_w} = $knob_w;
2059 } 2464 }
2060}
2061
2062# the inner_* stuff is for generating a padding for the slider handle,
2063# so that the handle doesn't leave the texture. This calculation isn't 100%
2064# correct propably, but it does the job for now
2065sub _calc_inner_pad_px {
2066 my ($self, $w) = @_;
2067 ($w / 100) * $self->{inner_pad} # % to pixels
2068}
2069
2070sub _draw {
2071 my ($self) = @_;
2072 2465
2073 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2074 2467
2075 my ($w, $h) = @$self{qw(w h)}; 2468 glScale $self->{w}, $self->{h};
2076 2469
2077 if ($self->{vertical}) { 2470 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2471 # draw a vertical slider like a rotated horizontal slider
2079 2472
2473 glTranslate 1, 0, 0;
2080 glRotate 90, 0, 0, 1; 2474 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2475 }
2085 2476
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2477 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2478 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2479
2089 my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091 $hi = $value + 1 if $lo == $hi;
2092
2093 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096 $page = int $page * $inner_w / ($hi - $lo);
2097 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099 $w -= $page;
2100 $page &= ~1;
2101 glTranslate $page * 0.5, 0, 0;
2102 $page ||= 2;
2103
2104 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107 glEnable GL_BLEND;
2108 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109 glEnable GL_TEXTURE_2D; 2480 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2482
2112 # draw background 2483 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2484 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2485
2115 # draw handle 2486 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2487 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117 2488
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2120} 2490}
2121 2491
2122############################################################################# 2492#############################################################################
2123 2493
2494package CFClient::UI::ValSlider;
2495
2496our @ISA = CFClient::UI::HBox::;
2497
2498sub new {
2499 my ($class, %arg) = @_;
2500
2501 my $range = delete $arg{range};
2502
2503 my $self = $class->SUPER::new (
2504 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2505 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2506 to_value => sub { shift },
2507 from_value => sub { shift },
2508 %arg,
2509 );
2510
2511 $self->{slider}->connect (changed => sub {
2512 my ($self, $value) = @_;
2513 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2514 $self->{parent}->emit (changed => $value);
2515 });
2516
2517# $self->{entry}->connect (changed => sub {
2518# my ($self, $value) = @_;
2519# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2520# $self->{parent}->emit (changed => $value);
2521# });
2522
2523 $self->add ($self->{slider}, $self->{entry});
2524
2525 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2526
2527 $self
2528}
2529
2530sub set_range { shift->{slider}->set_range (@_) }
2531sub set_value { shift->{slider}->set_value (@_) }
2532
2533#############################################################################
2534
2124package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2125 2536
2126our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2127 2538
2128use CFClient::OpenGL; 2539use CFClient::OpenGL;
2129 2540
… …
2131 my $class = shift; 2542 my $class = shift;
2132 2543
2133 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2134 fontsize => 1, 2545 fontsize => 1,
2135 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2136 #font => default_font 2548 #font => default_font
2137 @_, 2549 @_,
2138 2550
2139 layout => (new CFClient::Layout), 2551 layout => (new CFClient::Layout 1),
2140 par => [], 2552 par => [],
2141 height => 0, 2553 height => 0,
2142 children => [ 2554 children => [
2143 (new CFClient::UI::Empty expand => 1), 2555 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2556 (new CFClient::UI::Slider vertical => 1),
… …
2155 2567
2156 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2157 $self->reflow; 2569 $self->reflow;
2158} 2570}
2159 2571
2160sub text_height { 2572sub visible_children {
2161 my ($self, $text) = @_; 2573 my ($self) = @_;
2162 2574
2163 my $layout = $self->{layout}; 2575 @{$self->{children}}[0,1]
2164
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text);
2168
2169 ($layout->size)[1]
2170} 2576}
2171 2577
2172sub reflow {
2173 my ($self) = @_;
2174
2175 $self->{need_reflow}++;
2176 $self->update;
2177}
2178
2179sub size_allocate { 2578sub invoke_size_allocate {
2180 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2181 2580
2182 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2183 2583
2184 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2185 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2186 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2187 2588
2188 $self->reflow; 2589 $self->reflow;
2590
2591 $self->SUPER::invoke_size_allocate ($w, $h)
2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2596
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2606 $layout
2607}
2608
2609sub reflow {
2610 my ($self) = @_;
2611
2612 $self->{need_reflow}++;
2613 $self->update;
2614}
2615
2616sub set_offset {
2617 my ($self, $offset) = @_;
2618
2619 # todo: base offset on lines or so, not on pixels
2620 $self->{children}[1]->set_value ($offset);
2621}
2622
2623sub clear {
2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2628
2629 $self->{par} = [];
2630 $self->{height} = 0;
2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2189} 2632}
2190 2633
2191sub add_paragraph { 2634sub add_paragraph {
2192 my ($self, $color, $text) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2193 2636
2194 #TODO: intelligently "reformat" paragraph 2637 my ($text, @w) = ref $para ? @$para : $para;
2195 2638
2196 my $height = $self->text_height ($text); 2639 $para = {
2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2646 };
2197 2647
2198 $self->{height} += $height; 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2199 2650
2200 push @{$self->{par}}, [$height, $color, $text]; 2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2201 2654
2202 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2655sub scroll_to_bottom {
2203 $self->{children}[1]->update; 2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2204} 2660}
2205 2661
2206sub update { 2662sub update {
2207 my ($self) = @_; 2663 my ($self) = @_;
2208 2664
… …
2210 2666
2211 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2212 2668
2213 delete $self->{texture}; 2669 delete $self->{texture};
2214 2670
2215 $ROOT->on_refresh ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673
2216 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2675 my $height = 0;
2218 2676
2219 $height += $_->[0] = $self->text_height ($_->[2])
2220 for @{$self->{par}}; 2677 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size;
2681
2682 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2685 }
2686
2687 $height += $para->{h};
2688 }
2221 2689
2222 $self->{height} = $height; 2690 $self->{height} = $height;
2223 2691
2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2225 2693
2226 delete $self->{texture}; 2694 delete $self->{texture};
2227 } 2695 }
2228 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230 glClearColor 0, 0, 0, 0; 2702 glClearColor 0, 0, 0, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2232 2704
2705 my $top = int $self->{children}[1]{range}[0];
2706
2707 my $y0 = $top;
2708 my $y1 = $top + $H;
2709
2710 my $y = 0;
2711
2233 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2713 #TODO# not correct in windows where rgba is forced off
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237 2715
2238 my $top = int $self->{children}[1]{range}[0];
2239
2240 my $y0 = $top;
2241 my $y1 = $top + $self->{h};
2242
2243 my $y = 0;
2244
2245 my $layout = $self->{layout};
2246
2247 $layout->set_font ($self->{font}) if $self->{font};
2248
2249 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2250 my $h = $par->[0]; 2717 my $h = $para->{h};
2251 2718
2252 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2253 $layout->set_text ($par->[2]);
2254 2720
2255 glColor @{ $par->[1] }; 2721 my $layout = $self->get_layout ($para);
2256 my ($W, $H) = $layout->size; 2722
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0;
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2258 } 2740 }
2259 2741
2260 $y += $h; 2742 $y += $h;
2261 } 2743 }
2262 2744
2263 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2265 }; 2746 };
2266 }); 2747 });
2267} 2748}
2268 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2269sub _draw { 2759sub _draw {
2270 my ($self) = @_; 2760 my ($self) = @_;
2271 2761
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2767
2281 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2282
2283} 2769}
2284 2770
2285############################################################################# 2771#############################################################################
2286 2772
2287package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2332 2818
2333sub new { 2819sub new {
2334 my $class = shift; 2820 my $class = shift;
2335 2821
2336 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2337 state => 0, 2823 state => 0,
2338 connect_activate => \&toggle_flopper, 2824 on_activate => \&toggle_flopper,
2339 @_ 2825 @_
2340 ); 2826 );
2341 2827
2342 if ($self->{state}) {
2343 $self->{state} = 0;
2344 $self->toggle_flopper;
2345 }
2346
2347 $self 2828 $self
2348} 2829}
2349 2830
2350sub toggle_flopper { 2831sub toggle_flopper {
2351 my ($self) = @_; 2832 my ($self) = @_;
2352 2833
2353 # TODO: use animation 2834 $self->{other}->toggle_visibility;
2354 if ($self->{state} = !$self->{state}) {
2355 $CFClient::UI::ROOT->add ($self->{other});
2356 $self->{other}->move ($self->coord2global (0, $self->{h}));
2357 $self->emit ("open");
2358 } else {
2359 $CFClient::UI::ROOT->remove ($self->{other});
2360 $self->emit ("close");
2361 }
2362
2363 $self->emit (changed => $self->{state});
2364} 2835}
2365 2836
2366############################################################################# 2837#############################################################################
2367 2838
2368package CFClient::UI::Tooltip; 2839package CFClient::UI::Tooltip;
… …
2378 @_, 2849 @_,
2379 can_events => 0, 2850 can_events => 0,
2380 ) 2851 )
2381} 2852}
2382 2853
2383sub set_markup { 2854sub set_tooltip_from {
2384 my ($self, $text) = @_; 2855 my ($self, $widget) = @_;
2385 2856
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2857 my $tooltip = $widget->{tooltip};
2387 $self->{label}->set_markup ($text); 2858
2388 $self->add ($self->{label}); 2859 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2862 . "req $widget->{req_w} $widget->{req_h}\n"
2863 . "visible $widget->{visible}";
2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2868
2869 $self->add (new CFClient::UI::Label
2870 markup => $tooltip,
2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872 fontsize => 0.8,
2873 fg => [0, 0, 0, 1],
2874 ellipsise => 0,
2875 font => ($widget->{tooltip_font} || $::FONT_PROP),
2876 );
2389} 2877}
2390 2878
2391sub size_request { 2879sub size_request {
2392 my ($self) = @_; 2880 my ($self) = @_;
2393 2881
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2883
2398 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2399} 2885}
2400 2886
2401sub size_allocate { 2887sub invoke_size_allocate {
2402 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2403 2889
2404 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2891}
2892
2893sub invoke_visibility_change {
2894 my ($self, $visible) = @_;
2895
2896 return unless $visible;
2897
2898 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner}
2900 or return;
2901
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w};
2906
2907 $self->move_abs ($x, $y);
2908 });
2405} 2909}
2406 2910
2407sub _draw { 2911sub _draw {
2408 my ($self) = @_; 2912 my ($self) = @_;
2409 2913
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2914 glTranslate 0.375, 0.375;
2412 2915
2413 my ($w, $h) = @$self{qw(w h)}; 2916 my ($w, $h) = @$self{qw(w h)};
2414 2917
2415 glColor 1, 0.8, 0.4; 2918 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2929 glVertex 0 , $h;
2427 glVertex $w, $h; 2930 glVertex $w, $h;
2428 glVertex $w, 0; 2931 glVertex $w, 0;
2429 glEnd; 2932 glEnd;
2430 2933
2431 glPopMatrix; 2934 glTranslate 2 - 0.375, 2 - 0.375;
2432 2935
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2936 $self->SUPER::_draw;
2435} 2937}
2436 2938
2437############################################################################# 2939#############################################################################
2438 2940
… …
2443use CFClient::OpenGL; 2945use CFClient::OpenGL;
2444 2946
2445sub new { 2947sub new {
2446 my $class = shift; 2948 my $class = shift;
2447 2949
2448 $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
2449 aspect => 1, 2951 aspect => 1,
2952 can_events => 0,
2450 @_, 2953 @_,
2451 ) 2954 );
2955
2956 if ($self->{anim} && $self->{animspeed}) {
2957 Scalar::Util::weaken (my $widget = $self);
2958
2959 $self->{timer} = Event->timer (
2960 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961 hard => 1,
2962 interval => $self->{animspeed},
2963 cb => sub {
2964 ++$widget->{frame};
2965 $widget->update;
2966 },
2967 );
2968 }
2969
2970 $self
2452} 2971}
2453 2972
2454sub size_request { 2973sub size_request {
2455 (32, 8) 2974 (32, 8)
2456} 2975}
2457 2976
2977sub update {
2978 my ($self) = @_;
2979
2980 return unless $self->{visible};
2981
2982 $self->SUPER::update;
2983}
2984
2458sub _draw { 2985sub _draw {
2459 my ($self) = @_; 2986 my ($self) = @_;
2460 2987
2461 return unless $::CONN;#d# manage and cache textures differently 2988 return unless $::CONN;
2989
2990 my $face;
2991
2992 if ($self->{frame}) {
2993 my $anim = $::CONN->{anim}[$self->{anim}];
2994
2995 $face = $anim->[ $self->{frame} % @$anim ]
2996 if $anim && @$anim;
2997 }
2998
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463 3000
2464 # TODO animation
2465 if ($tex) { 3001 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 3007 }
3008}
3009
3010sub destroy {
3011 my ($self) = @_;
3012
3013 $self->{timer}->cancel
3014 if $self->{timer};
3015
3016 $self->SUPER::destroy;
2475} 3017}
2476 3018
2477############################################################################# 3019#############################################################################
2478 3020
2479package CFClient::UI::InventoryItem; 3021package CFClient::UI::Buttonbar;
2480 3022
2481our @ISA = CFClient::UI::HBox::; 3023our @ISA = CFClient::UI::HBox::;
2482 3024
2483sub new { 3025# TODO: should actualyl wrap buttons and other goodies.
2484 my $class = shift;
2485
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new (
2496 can_hover => 1,
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_,
2555 );
2556
2557 $self
2558}
2559
2560sub set_items {
2561 my ($self, $items) = @_;
2562
2563 $self->{scrolled}->clear;
2564 return unless $items;
2565
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2567
2568 $self->{real_items} = \@items;
2569
2570 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2576 }
2577
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579}
2580
2581sub size_request {
2582 my ($self) = @_;
2583 ($self->{req_w}, $self->{req_h});
2584}
2585 3026
2586############################################################################# 3027#############################################################################
2587 3028
2588package CFClient::UI::Menu; 3029package CFClient::UI::Menu;
2589 3030
… …
2601 ); 3042 );
2602 3043
2603 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2604 3045
2605 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2606 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2607 3048
2608 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2609 if (!ref $widget) { 3050 if (!ref $widget) {
2610 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2611 can_hover => 1, 3052 can_hover => 1,
2612 can_events => 1, 3053 can_events => 1,
2613 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2614 } 3056 }
2615 3057
2616 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2617 3059
2618 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2630 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self; 3073 $GRAB = $self;
2632 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2633 3075
2634 $self->show; 3076 $self->show;
2635 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2636} 3078}
2637 3079
2638sub mouse_motion { 3080sub invoke_mouse_motion {
2639 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2640 3082
2641 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2642 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2643 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2644}
2645 3086
3087 0
3088}
3089
2646sub button_up { 3090sub invoke_button_up {
2647 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2648 3092
2649 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB; 3094 undef $GRAB;
2651 $self->hide; 3095 $self->hide;
2652 3096
2653 $self->emit ("popdown"); 3097 $self->emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3099 } else {
3100 return 0
3101 }
3102
2655 } 3103 1
2656} 3104}
2657 3105
2658############################################################################# 3106#############################################################################
2659 3107
2660package CFClient::UI::Root; 3108package CFClient::UI::Multiplexer;
2661 3109
2662our @ISA = CFClient::UI::Container::; 3110our @ISA = CFClient::UI::Container::;
2663
2664use CFClient::OpenGL;
2665 3111
2666sub new { 3112sub new {
2667 my $class = shift; 3113 my $class = shift;
2668 3114
2669 $class->SUPER::new ( 3115 my $self = $class->SUPER::new (
3116 @_,
3117 );
3118
3119 $self->{current} = $self->{children}[0]
3120 if @{ $self->{children} };
3121
3122 $self
3123}
3124
3125sub add {
3126 my ($self, @widgets) = @_;
3127
3128 $self->SUPER::add (@widgets);
3129
3130 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} };
3132}
3133
3134sub set_current_page {
3135 my ($self, $page_or_widget) = @_;
3136
3137 my $widget = ref $page_or_widget
3138 ? $page_or_widget
3139 : $self->{children}[$page_or_widget];
3140
3141 $self->{current} = $widget;
3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3143
3144 $self->emit (page_changed => $self->{current});
3145
3146 $self->realloc;
3147}
3148
3149sub visible_children {
3150 $_[0]{current}
3151}
3152
3153sub size_request {
3154 my ($self) = @_;
3155
3156 $self->{current}->size_request
3157}
3158
3159sub invoke_size_allocate {
3160 my ($self, $w, $h) = @_;
3161
3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3165}
3166
3167sub _draw {
3168 my ($self) = @_;
3169
3170 $self->{current}->draw;
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Notebook;
3176
3177our @ISA = CFClient::UI::VBox::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self
3186 @_,
3187 );
3188
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191
3192 $self
3193}
3194
3195sub add {
3196 my ($self, $title, $widget, $tooltip) = @_;
3197
3198 Scalar::Util::weaken $self;
3199
3200 $self->{buttonbar}->add (new CFClient::UI::Button
3201 markup => $title,
3202 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) },
3204 );
3205
3206 $self->{multiplexer}->add ($widget);
3207}
3208
3209sub set_current_page {
3210 my ($self, $page) = @_;
3211
3212 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current});
3214}
3215
3216#############################################################################
3217
3218package CFClient::UI::Combobox;
3219
3220use utf8;
3221
3222our @ISA = CFClient::UI::Button::;
3223
3224sub new {
3225 my $class = shift;
3226
3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Statusbox;
3275
3276our @ISA = CFClient::UI::VBox::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (
3282 fontsize => 0.8,
3283 @_,
3284 );
3285
3286 Scalar::Util::weaken (my $this = $self);
3287
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289
3290 $self
3291}
3292
3293sub reorder {
3294 my ($self) = @_;
3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
3301
3302 while (my ($k, $v) = each %{ $self->{item} }) {
3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304 }
3305
3306 my @widgets;
3307
3308 my @items = sort {
3309 $a->{pri} <=> $b->{pri}
3310 or $b->{id} <=> $a->{id}
3311 } values %{ $self->{item} };
3312
3313 $self->{timer}->interval (1);
3314
3315 my $count = 10 + 1;
3316 for my $item (@items) {
3317 last unless --$count;
3318
3319 my $label = $item->{label} ||= do {
3320 # TODO: doesn't handle markup well (read as: at all)
3321 my $short = $item->{count} > 1
3322 ? "<b>$item->{count} ×</b> $item->{text}"
3323 : $item->{text};
3324
3325 for ($short) {
3326 s/^\s+//;
3327 s/\s+/ /g;
3328 }
3329
3330 new CFClient::UI::Label
3331 markup => $short,
3332 tooltip => $item->{tooltip},
3333 tooltip_font => $::FONT_PROP,
3334 tooltip_width => 0.67,
3335 fontsize => $item->{fontsize} || $self->{fontsize},
3336 max_w => $::WIDTH * 0.44,
3337 fg => [@{ $item->{fg} }],
3338 can_events => 1,
3339 can_hover => 1
3340 };
3341
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 }
3351
3352 push @widgets, $label;
3353 }
3354
3355 $self->clear;
3356 $self->SUPER::add (reverse @widgets);
3357}
3358
3359sub add {
3360 my ($self, $text, %arg) = @_;
3361
3362 $text =~ s/^\s+//;
3363 $text =~ s/\s+$//;
3364
3365 return unless $text;
3366
3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3368
3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3370
3371 if (my $item = $self->{item}{$group}) {
3372 if ($item->{text} eq $text) {
3373 $item->{count}++;
3374 } else {
3375 $item->{count} = 1;
3376 $item->{text} = $item->{tooltip} = $text;
3377 }
3378 $item->{id} += 0.2;#d#
3379 $item->{timeout} = $timeout;
3380 delete $item->{label};
3381 } else {
3382 $self->{item}{$group} = {
3383 id => ++$self->{id},
3384 text => $text,
3385 timeout => $timeout,
3386 tooltip => $text,
3387 fg => [0.8, 0.8, 0.8, 0.8],
3388 pri => 0,
3389 count => 1,
3390 %arg,
3391 };
3392 }
3393
3394 $self->reorder;
3395}
3396
3397sub reconfigure {
3398 my ($self) = @_;
3399
3400 delete $_->{label}
3401 for values %{ $self->{item} || {} };
3402
3403 $self->reorder;
3404 $self->SUPER::reconfigure;
3405}
3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
3415#############################################################################
3416
3417package CFClient::UI::Inventory;
3418
3419our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421sub new {
3422 my $class = shift;
3423
3424 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426 @_,
3427 );
3428
3429 $self
3430}
3431
3432sub set_items {
3433 my ($self, $items) = @_;
3434
3435 $self->{child}->clear;
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663}
3664
3665#############################################################################
3666
3667package CFClient::UI::SpellList;
3668
3669our @ISA = CFClient::UI::Table::;
3670
3671sub new {
3672 my $class = shift;
3673
3674 my $self = $class->SUPER::new (
3675 binding => [],
3676 commands => [],
2670 @_, 3677 @_,
2671 ) 3678 )
2672} 3679}
2673 3680
2674sub configure { 3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2675 my ($self, $x, $y, $w, $h) = @_;
2676 3682
2677 $self->{w} = $w; 3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2678 $self->{h} = $h; 3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2679} 3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2680 3693
2681sub check_size { 3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3766sub add_spell {
2682 my ($self) = @_; 3767 my ($self, $spell) = @_;
2683 3768
2684 $self->size_allocate ($self->{w}, $self->{h}) 3769 $self->{spell}->{$spell->{name}} = $spell;
2685 if $self->{w}; 3770 $self->rebuild_spell_list;
3771}
3772
3773sub remove_spell {
3774 my ($self, $spell) = @_;
3775
3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3787#############################################################################
3788
3789package CFClient::UI::Root;
3790
3791our @ISA = CFClient::UI::Container::;
3792
3793use List::Util qw(min max);
3794
3795use CFClient::OpenGL;
3796
3797sub new {
3798 my $class = shift;
3799
3800 my $self = $class->SUPER::new (
3801 visible => 1,
3802 @_,
3803 );
3804
3805 Scalar::Util::weaken ($self->{root} = $self);
3806
3807 $self
2686} 3808}
2687 3809
2688sub size_request { 3810sub size_request {
2689 my ($self) = @_; 3811 my ($self) = @_;
2690 3812
2691 ($self->{w}, $self->{h}) 3813 ($self->{w}, $self->{h})
2692} 3814}
2693 3815
3816sub _to_pixel {
3817 my ($coord, $size, $max) = @_;
3818
3819 $coord =
3820 $coord eq "center" ? ($max - $size) * 0.5
3821 : $coord eq "max" ? $max
3822 : $coord;
3823
3824 $coord = 0 if $coord < 0;
3825 $coord = $max - $size if $coord > $max - $size;
3826
3827 int $coord + 0.5
3828}
3829
2694sub size_allocate { 3830sub invoke_size_allocate {
2695 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
2696
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712 3832
2713 for my $child ($self->children) { 3833 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715 3835
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3836 $X = $child->{force_x} if exists $child->{force_x};
2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3837 $Y = $child->{force_y} if exists $child->{force_y};
3838
3839 $X = _to_pixel $X, $W, $self->{w};
3840 $Y = _to_pixel $Y, $H, $self->{h};
3841
2718 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
2719 } 3843 }
2720 3844
2721 $self->{old_w} = $w; 3845 1
2722 $self->{old_h} = $h;
2723} 3846}
2724 3847
2725sub coord2local { 3848sub coord2local {
2726 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
2727 3850
… …
2735} 3858}
2736 3859
2737sub update { 3860sub update {
2738 my ($self) = @_; 3861 my ($self) = @_;
2739 3862
2740 $self->check_size;
2741 $::WANT_REFRESH++; 3863 $::WANT_REFRESH++;
2742} 3864}
2743 3865
2744sub add { 3866sub add {
2745 my ($self, $child) = @_; 3867 my ($self, @children) = @_;
2746 3868
2747 # integerise window positions 3869 $_->{is_toplevel} = 1
2748 $child->{x} = int $child->{x}; 3870 for @children;
2749 $child->{y} = int $child->{y};
2750 3871
2751 $self->SUPER::add ($child); 3872 $self->SUPER::add (@children);
3873}
3874
3875sub remove {
3876 my ($self, @children) = @_;
3877
3878 $self->SUPER::remove (@children);
3879
3880 delete $self->{is_toplevel}
3881 for @children;
3882
3883 while (@children) {
3884 my $w = pop @children;
3885 push @children, $w->children;
3886 $w->set_invisible;
3887 }
2752} 3888}
2753 3889
2754sub on_refresh { 3890sub on_refresh {
2755 my ($self, $id, $cb) = @_; 3891 my ($self, $id, $cb) = @_;
2756 3892
2757 $self->{refresh_hook}{$id} = $cb; 3893 $self->{refresh_hook}{$id} = $cb;
2758} 3894}
2759 3895
3896sub on_post_alloc {
3897 my ($self, $id, $cb) = @_;
3898
3899 $self->{post_alloc_hook}{$id} = $cb;
3900}
3901
2760sub draw { 3902sub draw {
2761 my ($self) = @_; 3903 my ($self) = @_;
2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806 3904
2807 while ($self->{refresh_hook}) { 3905 while ($self->{refresh_hook}) {
2808 $_->() 3906 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3907 for values %{delete $self->{refresh_hook}};
2810 } 3908 }
2811 3909
3910 if ($self->{realloc}) {
3911 my %queue;
3912 my @queue;
3913 my $widget;
3914
3915 outer:
3916 while () {
3917 if (my $realloc = delete $self->{realloc}) {
3918 for $widget (values %$realloc) {
3919 $widget->{visible} or next; # do not resize invisible widgets
3920
3921 $queue{$widget+0}++ and next; # duplicates are common
3922
3923 push @{ $queue[$widget->{visible}] }, $widget;
3924 }
3925 }
3926
3927 while () {
3928 @queue or last outer;
3929
3930 $widget = pop @{ $queue[-1] || [] }
3931 and last;
3932
3933 pop @queue;
3934 }
3935
3936 delete $queue{$widget+0};
3937
3938 my ($w, $h) = $widget->size_request;
3939
3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3942
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3945
3946 $w = $widget->{force_w} if exists $widget->{force_w};
3947 $h = $widget->{force_h} if exists $widget->{force_h};
3948
3949 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3950 || delete $widget->{force_realloc}) {
3951 $widget->{req_w} = $w;
3952 $widget->{req_h} = $h;
3953
3954 $self->{size_alloc}{$widget+0} = $widget;
3955
3956 if (my $parent = $widget->{parent}) {
3957 $self->{realloc}{$parent+0} = $parent
3958 unless $queue{$parent+0};
3959
3960 $parent->{force_size_alloc} = 1;
3961 $self->{size_alloc}{$parent+0} = $parent;
3962 }
3963 }
3964
3965 delete $self->{realloc}{$widget+0};
3966 }
3967 }
3968
3969 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} }
3971 values %$size_alloc;
3972
3973 while () {
3974 my $widget = pop @queue || last;
3975
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977
3978 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0;
3980
3981 $w = int $w + 0.5;
3982 $h = int $h + 0.5;
3983
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w};
3986 $widget->{old_h} = $widget->{h};
3987
3988 $widget->{w} = $w;
3989 $widget->{h} = $h;
3990
3991 $widget->emit (size_allocate => $w, $h);
3992 }
3993 }
3994 }
3995
3996 while ($self->{post_alloc_hook}) {
3997 $_->()
3998 for values %{delete $self->{post_alloc_hook}};
3999 }
4000
4001
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4002 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 4004 glClear GL_COLOR_BUFFER_BIT;
2815 4005
2816 glMatrixMode GL_PROJECTION; 4006 glMatrixMode GL_PROJECTION;
2817 glLoadIdentity; 4007 glLoadIdentity;
2818 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819 glMatrixMode GL_MODELVIEW; 4009 glMatrixMode GL_MODELVIEW;
2820 glLoadIdentity; 4010 glLoadIdentity;
2821 4011
4012 {
4013 package CFClient::UI::Base;
4014
4015 ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h});
4017 }
4018
2822 $self->_draw; 4019 $self->_draw;
2823} 4020}
2824 4021
2825############################################################################# 4022#############################################################################
2826 4023
2827package CFClient::UI; 4024package CFClient::UI;
2828 4025
2829$ROOT = new CFClient::UI::Root; 4026$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 4027$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 4028
28321 40291
2833 4030

Diff Legend

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