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

Diff Legend

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