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.305 by root, Sun Jun 18 17:13:12 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) {
… …
1614 } else { 1919 } else {
1615 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1616 } 1921 }
1617 1922
1618 } else { 1923 } else {
1619 $self->SUPER::key_down ($ev); 1924 return $self->SUPER::invoke_key_down ($ev)
1925 }
1926
1620 } 1927 1
1621
1622} 1928}
1623 1929
1624############################################################################# 1930#############################################################################
1625 1931
1626package CFClient::UI::Button; 1932package CFClient::UI::Button;
… …
1635 1941
1636sub new { 1942sub new {
1637 my $class = shift; 1943 my $class = shift;
1638 1944
1639 $class->SUPER::new ( 1945 $class->SUPER::new (
1640 padding => 4, 1946 padding_x => 4,
1947 padding_y => 4,
1641 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1949 active_fg => [0, 0, 1],
1644 can_hover => 1, 1950 can_hover => 1,
1645 align => 0, 1951 align => 0,
1646 valign => 0, 1952 valign => 0,
1647 can_events => 1, 1953 can_events => 1,
1648 @_ 1954 @_
1649 ) 1955 )
1650} 1956}
1651 1957
1652sub button_up { 1958sub invoke_button_up {
1653 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1654 1960
1961 $self->emit ("activate")
1655 if ($x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1656 && $y >= 0 && $y < $self->{h}) { 1963 && $y >= 0 && $y < $self->{h};
1657 $self->emit ("activate"); 1964
1658 } 1965 1
1659} 1966}
1660 1967
1661sub _draw { 1968sub _draw {
1662 my ($self) = @_; 1969 my ($self) = @_;
1663 1970
1664 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1665 1972
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; 1973 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1675 1976
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1977 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1978
1678 glDisable GL_TEXTURE_2D; 1979 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1980
1681 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1982}
1983
1984#############################################################################
1985
1986package CFClient::UI::ImageButton;
1987
1988our @ISA = CFClient::UI::Image::;
1989
1990use CFClient::OpenGL;
1991
1992my %textures;
1993
1994sub new {
1995 my $class = shift;
1996
1997 my $self = $class->SUPER::new (
1998 padding_x => 4,
1999 padding_y => 4,
2000 fg => [1, 1, 1],
2001 active_fg => [0, 0, 1],
2002 can_hover => 1,
2003 align => 0,
2004 valign => 0,
2005 can_events => 1,
2006 @_
2007 );
2008}
2009
2010sub invoke_button_up {
2011 my ($self, $ev, $x, $y) = @_;
2012
2013 $self->emit ("activate")
2014 if $x >= 0 && $x < $self->{w}
2015 && $y >= 0 && $y < $self->{h};
2016
2017 1
1682} 2018}
1683 2019
1684############################################################################# 2020#############################################################################
1685 2021
1686package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
… …
1695 2031
1696sub new { 2032sub new {
1697 my $class = shift; 2033 my $class = shift;
1698 2034
1699 $class->SUPER::new ( 2035 $class->SUPER::new (
1700 padding => 2, 2036 padding_x => 2,
2037 padding_y => 2,
1701 fg => [1, 1, 1], 2038 fg => [1, 1, 1],
1702 active_fg => [1, 1, 0], 2039 active_fg => [1, 1, 0],
2040 bg => [0, 0, 0, 0.2],
2041 active_bg => [1, 1, 1, 0.5],
1703 state => 0, 2042 state => 0,
1704 can_hover => 1, 2043 can_hover => 1,
1705 @_ 2044 @_
1706 ) 2045 )
1707} 2046}
1708 2047
1709sub size_request { 2048sub size_request {
1710 my ($self) = @_; 2049 my ($self) = @_;
1711 2050
1712 ($self->{padding} * 2 + 6) x 2 2051 (6) x 2
1713} 2052}
1714 2053
1715sub button_down { 2054sub invoke_button_down {
1716 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1717 2056
1718 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1719 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1720 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1721 $self->emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
1722 } 2065 1
1723} 2066}
1724 2067
1725sub _draw { 2068sub _draw {
1726 my ($self) = @_; 2069 my ($self) = @_;
1727 2070
1728 $self->SUPER::_draw; 2071 $self->SUPER::_draw;
1729 2072
1730 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2073 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1731 2074
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2075 my ($w, $h) = @$self{qw(w h)};
2076
2077 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1733 2078
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2079 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 2080
1736 glEnable GL_BLEND; 2081 my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
1737 glEnable GL_TEXTURE_2D; 2083 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); 2084 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 2085 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 2086}
1747 2087
1748############################################################################# 2088#############################################################################
1749 2089
1750package CFClient::UI::Image; 2090package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 2133 glTranslate 0, -$self->{w}, 0;
1794 2134
1795 ($w, $h) = ($h, $w); 2135 ($w, $h) = ($h, $w);
1796 } 2136 }
1797 2137
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 2138 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 2140
1803 $tex->draw_quad (0, 0, $w, $h); 2141 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 2142
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 2143 glDisable GL_TEXTURE_2D;
1807} 2144}
1808 2145
1809############################################################################# 2146#############################################################################
1810 2147
… …
1900 2237
1901 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
1902 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
1903 2240
1904 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
1905 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1906 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1908 2246
1909 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
1910 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2337 qw(s1_slider.png s1_slider_bg.png);
2000 2338
2001sub new { 2339sub new {
2002 my $class = shift; 2340 my $class = shift;
2003 2341
2004 # range [value, low, high, page] 2342 # range [value, low, high, page, unit]
2005 2343
2006 # TODO: 0-width page 2344 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2345 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2346 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2347 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2348 fg => [1, 1, 1],
2011 active_fg => [0, 0, 0], 2349 active_fg => [0, 0, 0],
2350 bg => [0, 0, 0, 0.2],
2351 active_bg => [1, 1, 1, 0.5],
2012 range => [0, 0, 100, 10], 2352 range => [0, 0, 100, 10, 0],
2013 req_w => $::WIDTH / 80, 2353 min_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2354 min_h => $::WIDTH / 80,
2015 vertical => 0, 2355 vertical => 0,
2016 can_hover => 1, 2356 can_hover => 1,
2017 inner_pad => 5, 2357 inner_pad => 0.02,
2018 @_ 2358 @_
2019 ); 2359 );
2020 2360
2361 $self->set_value ($self->{range}[0]);
2362 $self->update;
2363
2021 $self 2364 $self
2022} 2365}
2023 2366
2367sub set_range {
2368 my ($self, $range) = @_;
2369
2370 ($range, $self->{range}) = ($self->{range}, $range);
2371
2372 if ("@$range" ne "@{$self->{range}}") {
2373 $self->update;
2374 $self->set_value ($self->{range}[0]);
2375 }
2376}
2377
2378sub set_value {
2379 my ($self, $value) = @_;
2380
2381 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2382
2383 $hi = $lo + 1 if $hi <= $lo;
2384
2385 $page = $hi - $lo if $page > $hi - $lo;
2386
2387 $value = $lo if $value < $lo;
2388 $value = $hi - $page if $value > $hi - $page;
2389
2390 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2391 if $unit;
2392
2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2394
2395 if ($value != $old_value) {
2396 $self->emit (changed => $value);
2397 $self->update;
2398 }
2399}
2400
2024sub size_request { 2401sub size_request {
2025 my ($self) = @_; 2402 my ($self) = @_;
2026 2403
2027 my $w = $self->{req_w}; 2404 ($self->{req_w}, $self->{req_h})
2028 my $h = $self->{req_h};
2029
2030 $self->{vertical} ? ($h, $w) : ($w, $h)
2031} 2405}
2032 2406
2033sub button_down { 2407sub invoke_button_down {
2034 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2035 2409
2036 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413
2037 $self->mouse_motion ($ev, $x, $y); 2414 $self->mouse_motion ($ev, $x, $y)
2038} 2415}
2039 2416
2040sub mouse_motion { 2417sub invoke_mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2042 2419
2043 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2422
2423 my (undef, $lo, $hi, $page) = @{$self->{range}};
2424
2425 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2426
2427 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2428 } else {
2429 return 0;
2430 }
2431
2432 1
2433}
2434
2435sub update {
2436 my ($self) = @_;
2437
2438 delete $self->{knob_w};
2439 $self->SUPER::update;
2440}
2441
2442sub _draw {
2443 my ($self) = @_;
2444
2445 unless ($self->{knob_w}) {
2446 $self->set_value ($self->{range}[0]);
2447
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2449 my $range = ($hi - $page - $lo) || 1e-100;
2045 2450
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047 2452
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2453 $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 2454 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050 2455
2051 $x -= $inner_pad_px; # substract the padding 2456 $value = ($value - $lo) / $range;
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2457 $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 2458
2057 $self->emit (changed => $x); 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2058 $self->update; 2460 $self->{knob_w} = $knob_w;
2059 } 2461 }
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 2462
2073 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2074 2464
2075 my ($w, $h) = @$self{qw(w h)}; 2465 glScale $self->{w}, $self->{h};
2076 2466
2077 if ($self->{vertical}) { 2467 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2468 # draw a vertical slider like a rotated horizontal slider
2079 2469
2470 glTranslate 1, 0, 0;
2080 glRotate 90, 0, 0, 1; 2471 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2472 }
2085 2473
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2474 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2475 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2476
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; 2477 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2478 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2479
2112 # draw background 2480 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2481 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2482
2115 # draw handle 2483 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2484 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117 2485
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2486 glDisable GL_TEXTURE_2D;
2120} 2487}
2121 2488
2122############################################################################# 2489#############################################################################
2123 2490
2491package CFClient::UI::ValSlider;
2492
2493our @ISA = CFClient::UI::HBox::;
2494
2495sub new {
2496 my ($class, %arg) = @_;
2497
2498 my $range = delete $arg{range};
2499
2500 my $self = $class->SUPER::new (
2501 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2502 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2503 to_value => sub { shift },
2504 from_value => sub { shift },
2505 %arg,
2506 );
2507
2508 $self->{slider}->connect (changed => sub {
2509 my ($self, $value) = @_;
2510 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2511 $self->{parent}->emit (changed => $value);
2512 });
2513
2514# $self->{entry}->connect (changed => sub {
2515# my ($self, $value) = @_;
2516# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2517# $self->{parent}->emit (changed => $value);
2518# });
2519
2520 $self->add ($self->{slider}, $self->{entry});
2521
2522 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2523
2524 $self
2525}
2526
2527sub set_range { shift->{slider}->set_range (@_) }
2528sub set_value { shift->{slider}->set_value (@_) }
2529
2530#############################################################################
2531
2124package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2125 2533
2126our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2127 2535
2128use CFClient::OpenGL; 2536use CFClient::OpenGL;
2129 2537
… …
2131 my $class = shift; 2539 my $class = shift;
2132 2540
2133 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2134 fontsize => 1, 2542 fontsize => 1,
2135 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2136 #font => default_font 2545 #font => default_font
2137 @_, 2546 @_,
2138 2547
2139 layout => (new CFClient::Layout), 2548 layout => (new CFClient::Layout 1),
2140 par => [], 2549 par => [],
2141 height => 0, 2550 height => 0,
2142 children => [ 2551 children => [
2143 (new CFClient::UI::Empty expand => 1), 2552 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2553 (new CFClient::UI::Slider vertical => 1),
… …
2155 2564
2156 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2157 $self->reflow; 2566 $self->reflow;
2158} 2567}
2159 2568
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 { 2569sub invoke_size_allocate {
2180 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2181
2182 $self->SUPER::size_allocate ($w, $h);
2183 2571
2184 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2185 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2186 $self->{layout}->set_width ($self->{children}[0]{w}); 2574 $self->{layout}->set_width ($self->{children}[0]{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2187 2576
2188 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2580}
2581
2582sub text_size {
2583 my ($self, $text, $indent) = @_;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($text);
2591
2592 $layout->size
2593}
2594
2595sub reflow {
2596 my ($self) = @_;
2597
2598 $self->{need_reflow}++;
2599 $self->update;
2600}
2601
2602sub set_offset {
2603 my ($self, $offset) = @_;
2604
2605 # todo: base offset on lines or so, not on pixels
2606 $self->{children}[1]->set_value ($offset);
2607}
2608
2609sub clear {
2610 my ($self) = @_;
2611
2612 $self->{par} = [];
2613 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2189} 2615}
2190 2616
2191sub add_paragraph { 2617sub add_paragraph {
2192 my ($self, $color, $text) = @_; 2618 my ($self, $color, $text, $indent) = @_;
2193 2619
2194 #TODO: intelligently "reformat" paragraph 2620 for my $line (split /\n/, $text) {
2195 2621 my ($w, $h) = $self->text_size ($line);
2196 my $height = $self->text_height ($text);
2197
2198 $self->{height} += $height; 2622 $self->{height} += $h;
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2624 }
2199 2625
2200 push @{$self->{par}}, [$height, $color, $text];
2201
2202 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2626 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203 $self->{children}[1]->update;
2204} 2627}
2205 2628
2206sub update { 2629sub update {
2207 my ($self) = @_; 2630 my ($self) = @_;
2208 2631
… …
2210 2633
2211 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2212 2635
2213 delete $self->{texture}; 2636 delete $self->{texture};
2214 2637
2215 $ROOT->on_refresh ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640
2216 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2642 my $height = 0;
2218 2643
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2220 for @{$self->{par}}; 2648 for (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652 $layout->set_markup ($_->[4]);
2653 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3];
2655 $_->[1] = $h;
2656 }
2657
2658 $height += $_->[1];
2659 }
2221 2660
2222 $self->{height} = $height; 2661 $self->{height} = $height;
2223 2662
2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225 2664
2226 delete $self->{texture}; 2665 delete $self->{texture};
2227 } 2666 }
2228 2667
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230 glClearColor 0, 0, 0, 0; 2669 glClearColor 0, 0, 0, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2232 2671
2672 my $top = int $self->{children}[1]{range}[0];
2673
2674 my $y0 = $top;
2675 my $y1 = $top + $H;
2676
2677 my $y = 0;
2678
2679 my $layout = $self->{layout};
2680
2681 $layout->set_font ($self->{font}) if $self->{font};
2682
2233 glEnable GL_BLEND; 2683 glEnable GL_BLEND;
2684 #TODO# not correct in windows where rgba is forced off
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2685 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 2686
2249 for my $par (@{$self->{par}}) { 2687 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2688 my $h = $par->[1];
2251 2689
2252 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2691 $layout->set_foreground (@{ $par->[2] });
2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2253 $layout->set_text ($par->[2]); 2694 $layout->set_markup ($par->[4]);
2254 2695
2255 glColor @{ $par->[1] }; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256 my ($W, $H) = $layout->size; 2697
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2698 glRasterPos $par->[3], $y - $y0;
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258 } 2700 }
2259 2701
2260 $y += $h; 2702 $y += $h;
2261 } 2703 }
2262 2704
2263 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND; 2705 glDisable GL_BLEND;
2265 }; 2706 };
2266 }); 2707 });
2267} 2708}
2268 2709
2269sub _draw { 2710sub _draw {
2270 my ($self) = @_; 2711 my ($self) = @_;
2271 2712
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2718
2281 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2282 2720
2283} 2721}
2284 2722
… …
2332 2770
2333sub new { 2771sub new {
2334 my $class = shift; 2772 my $class = shift;
2335 2773
2336 my $self = $class->SUPER::new ( 2774 my $self = $class->SUPER::new (
2337 state => 0, 2775 state => 0,
2338 connect_activate => \&toggle_flopper, 2776 on_activate => \&toggle_flopper,
2339 @_ 2777 @_
2340 ); 2778 );
2341 2779
2342 if ($self->{state}) {
2343 $self->{state} = 0;
2344 $self->toggle_flopper;
2345 }
2346
2347 $self 2780 $self
2348} 2781}
2349 2782
2350sub toggle_flopper { 2783sub toggle_flopper {
2351 my ($self) = @_; 2784 my ($self) = @_;
2352 2785
2353 # TODO: use animation 2786 $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} 2787}
2365 2788
2366############################################################################# 2789#############################################################################
2367 2790
2368package CFClient::UI::Tooltip; 2791package CFClient::UI::Tooltip;
… …
2378 @_, 2801 @_,
2379 can_events => 0, 2802 can_events => 0,
2380 ) 2803 )
2381} 2804}
2382 2805
2383sub set_markup { 2806sub set_tooltip_from {
2384 my ($self, $text) = @_; 2807 my ($self, $widget) = @_;
2385 2808
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2809 my $tooltip = $widget->{tooltip};
2387 $self->{label}->set_markup ($text); 2810
2388 $self->add ($self->{label}); 2811 if ($ENV{CFPLUS_DEBUG} & 2) {
2812 $tooltip .= "\n\n" . (ref $widget) . "\n"
2813 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2814 . "req $widget->{req_w} $widget->{req_h}\n"
2815 . "visible $widget->{visible}";
2816 }
2817
2818 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//;
2820
2821 $self->add (new CFClient::UI::Label
2822 markup => $tooltip,
2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824 fontsize => 0.8,
2825 fg => [0, 0, 0, 1],
2826 ellipsise => 0,
2827 font => ($widget->{tooltip_font} || $::FONT_PROP),
2828 );
2389} 2829}
2390 2830
2391sub size_request { 2831sub size_request {
2392 my ($self) = @_; 2832 my ($self) = @_;
2393 2833
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2835
2398 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2399} 2837}
2400 2838
2401sub size_allocate { 2839sub invoke_size_allocate {
2402 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2403 2841
2404 $self->SUPER::size_allocate ($w - 4, $h - 4); 2842 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2843}
2844
2845sub invoke_visibility_change {
2846 my ($self, $visible) = @_;
2847
2848 return unless $visible;
2849
2850 $self->{root}->on_post_alloc ("move_$self" => sub {
2851 my $widget = $self->{owner}
2852 or return;
2853
2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855
2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857 if $x + $self->{w} > $self->{root}{w};
2858
2859 $self->move_abs ($x, $y);
2860 });
2405} 2861}
2406 2862
2407sub _draw { 2863sub _draw {
2408 my ($self) = @_; 2864 my ($self) = @_;
2409 2865
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2866 glTranslate 0.375, 0.375;
2412 2867
2413 my ($w, $h) = @$self{qw(w h)}; 2868 my ($w, $h) = @$self{qw(w h)};
2414 2869
2415 glColor 1, 0.8, 0.4; 2870 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2881 glVertex 0 , $h;
2427 glVertex $w, $h; 2882 glVertex $w, $h;
2428 glVertex $w, 0; 2883 glVertex $w, 0;
2429 glEnd; 2884 glEnd;
2430 2885
2431 glPopMatrix; 2886 glTranslate 2 - 0.375, 2 - 0.375;
2432 2887
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2888 $self->SUPER::_draw;
2435} 2889}
2436 2890
2437############################################################################# 2891#############################################################################
2438 2892
… …
2443use CFClient::OpenGL; 2897use CFClient::OpenGL;
2444 2898
2445sub new { 2899sub new {
2446 my $class = shift; 2900 my $class = shift;
2447 2901
2448 $class->SUPER::new ( 2902 my $self = $class->SUPER::new (
2449 aspect => 1, 2903 aspect => 1,
2904 can_events => 0,
2450 @_, 2905 @_,
2451 ) 2906 );
2907
2908 if ($self->{anim} && $self->{animspeed}) {
2909 Scalar::Util::weaken (my $widget = $self);
2910
2911 $self->{timer} = Event->timer (
2912 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913 hard => 1,
2914 interval => $self->{animspeed},
2915 cb => sub {
2916 ++$widget->{frame};
2917 $widget->update;
2918 },
2919 );
2920 }
2921
2922 $self
2452} 2923}
2453 2924
2454sub size_request { 2925sub size_request {
2455 (32, 8) 2926 (32, 8)
2456} 2927}
2457 2928
2929sub update {
2930 my ($self) = @_;
2931
2932 return unless $self->{visible};
2933
2934 $self->SUPER::update;
2935}
2936
2458sub _draw { 2937sub _draw {
2459 my ($self) = @_; 2938 my ($self) = @_;
2460 2939
2461 return unless $::CONN;#d# manage and cache textures differently 2940 return unless $::CONN;
2941
2942 my $face;
2943
2944 if ($self->{frame}) {
2945 my $anim = $::CONN->{anim}[$self->{anim}];
2946
2947 $face = $anim->[ $self->{frame} % @$anim ]
2948 if $anim && @$anim;
2949 }
2950
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463 2952
2464 # TODO animation
2465 if ($tex) { 2953 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2959 }
2960}
2961
2962sub destroy {
2963 my ($self) = @_;
2964
2965 $self->{timer}->cancel
2966 if $self->{timer};
2967
2968 $self->SUPER::destroy;
2475} 2969}
2476 2970
2477############################################################################# 2971#############################################################################
2478 2972
2479package CFClient::UI::InventoryItem; 2973package CFClient::UI::Buttonbar;
2480 2974
2481our @ISA = CFClient::UI::HBox::; 2975our @ISA = CFClient::UI::HBox::;
2482 2976
2483sub new { 2977# 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 2978
2586############################################################################# 2979#############################################################################
2587 2980
2588package CFClient::UI::Menu; 2981package CFClient::UI::Menu;
2589 2982
… …
2601 ); 2994 );
2602 2995
2603 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2604 2997
2605 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2606 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2607 3000
2608 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2609 if (!ref $widget) { 3002 if (!ref $widget) {
2610 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2611 can_hover => 1, 3004 can_hover => 1,
2612 can_events => 1, 3005 can_events => 1,
2613 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2614 } 3008 }
2615 3009
2616 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2617 3011
2618 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2630 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self; 3025 $GRAB = $self;
2632 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2633 3027
2634 $self->show; 3028 $self->show;
2635 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3029 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2636} 3030}
2637 3031
2638sub mouse_motion { 3032sub invoke_mouse_motion {
2639 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2640 3034
2641 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2642 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2643 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2644}
2645 3038
3039 0
3040}
3041
2646sub button_up { 3042sub invoke_button_up {
2647 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2648 3044
2649 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB; 3046 undef $GRAB;
2651 $self->hide; 3047 $self->hide;
2652 3048
2653 $self->emit ("popdown"); 3049 $self->emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3051 } else {
3052 return 0
3053 }
3054
2655 } 3055 1
2656} 3056}
2657 3057
2658############################################################################# 3058#############################################################################
2659 3059
2660package CFClient::UI::Root; 3060package CFClient::UI::Multiplexer;
2661 3061
2662our @ISA = CFClient::UI::Container::; 3062our @ISA = CFClient::UI::Container::;
2663
2664use CFClient::OpenGL;
2665 3063
2666sub new { 3064sub new {
2667 my $class = shift; 3065 my $class = shift;
2668 3066
2669 $class->SUPER::new ( 3067 my $self = $class->SUPER::new (
3068 @_,
3069 );
3070
3071 $self->{current} = $self->{children}[0]
3072 if @{ $self->{children} };
3073
3074 $self
3075}
3076
3077sub add {
3078 my ($self, @widgets) = @_;
3079
3080 $self->SUPER::add (@widgets);
3081
3082 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} };
3084}
3085
3086sub set_current_page {
3087 my ($self, $page_or_widget) = @_;
3088
3089 my $widget = ref $page_or_widget
3090 ? $page_or_widget
3091 : $self->{children}[$page_or_widget];
3092
3093 $self->{current} = $widget;
3094 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3095
3096 $self->emit (page_changed => $self->{current});
3097
3098 $self->realloc;
3099}
3100
3101sub visible_children {
3102 $_[0]{current}
3103}
3104
3105sub size_request {
3106 my ($self) = @_;
3107
3108 $self->{current}->size_request
3109}
3110
3111sub invoke_size_allocate {
3112 my ($self, $w, $h) = @_;
3113
3114 $self->{current}->configure (0, 0, $w, $h);
3115
3116 1
3117}
3118
3119sub _draw {
3120 my ($self) = @_;
3121
3122 $self->{current}->draw;
3123}
3124
3125#############################################################################
3126
3127package CFClient::UI::Notebook;
3128
3129our @ISA = CFClient::UI::VBox::;
3130
3131sub new {
3132 my $class = shift;
3133
3134 my $self = $class->SUPER::new (
3135 buttonbar => (new CFClient::UI::Buttonbar),
3136 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3137 # filter => # will be put between multiplexer and $self
3138 @_,
3139 );
3140
3141 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3142 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3143
3144 $self
3145}
3146
3147sub add {
3148 my ($self, $title, $widget, $tooltip) = @_;
3149
3150 Scalar::Util::weaken $self;
3151
3152 $self->{buttonbar}->add (new CFClient::UI::Button
3153 markup => $title,
3154 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) },
3156 );
3157
3158 $self->{multiplexer}->add ($widget);
3159}
3160
3161sub set_current_page {
3162 my ($self, $page) = @_;
3163
3164 $self->{multiplexer}->set_current_page ($page);
3165 $self->emit (page_changed => $self->{multiplexer}{current});
3166}
3167
3168#############################################################################
3169
3170package CFClient::UI::Combobox;
3171
3172use utf8;
3173
3174our @ISA = CFClient::UI::Button::;
3175
3176sub new {
3177 my $class = shift;
3178
3179 my $self = $class->SUPER::new (
3180 options => [], # [value, title, longdesc], ...
3181 value => undef,
3182 @_,
3183 );
3184
3185 $self->_set_value ($self->{value});
3186
3187 $self
3188}
3189
3190sub invoke_button_down {
3191 my ($self, $ev) = @_;
3192
3193 my @menu_items;
3194
3195 for (@{ $self->{options} }) {
3196 my ($value, $title, $tooltip) = @$_;
3197
3198 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199 }
3200
3201 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202}
3203
3204sub _set_value {
3205 my ($self, $value) = @_;
3206
3207 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3208 or return;
3209
3210 $self->{value} = $item->[0];
3211 $self->set_markup ("$item->[1] ⇓");
3212 $self->set_tooltip ($item->[2]);
3213}
3214
3215sub set_value {
3216 my ($self, $value) = @_;
3217
3218 return unless $self->{value} ne $value;
3219
3220 $self->_set_value ($value);
3221 $self->emit (changed => $value);
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::Statusbox;
3227
3228our @ISA = CFClient::UI::VBox::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (
3234 fontsize => 0.8,
3235 @_,
3236 );
3237
3238 Scalar::Util::weaken (my $this = $self);
3239
3240 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241
3242 $self
3243}
3244
3245sub reorder {
3246 my ($self) = @_;
3247 my $NOW = Time::HiRes::time;
3248
3249 # freeze display when hovering over any label
3250 return if $CFClient::UI::TOOLTIP->{owner}
3251 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3252 values %{ $self->{item} };
3253
3254 while (my ($k, $v) = each %{ $self->{item} }) {
3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256 }
3257
3258 my @widgets;
3259
3260 my @items = sort {
3261 $a->{pri} <=> $b->{pri}
3262 or $b->{id} <=> $a->{id}
3263 } values %{ $self->{item} };
3264
3265 $self->{timer}->interval (1);
3266
3267 my $count = 10 + 1;
3268 for my $item (@items) {
3269 last unless --$count;
3270
3271 my $label = $item->{label} ||= do {
3272 # TODO: doesn't handle markup well (read as: at all)
3273 my $short = $item->{count} > 1
3274 ? "<b>$item->{count} ×</b> $item->{text}"
3275 : $item->{text};
3276
3277 for ($short) {
3278 s/^\s+//;
3279 s/\s+/ /g;
3280 }
3281
3282 new CFClient::UI::Label
3283 markup => $short,
3284 tooltip => $item->{tooltip},
3285 tooltip_font => $::FONT_PROP,
3286 tooltip_width => 0.67,
3287 fontsize => $item->{fontsize} || $self->{fontsize},
3288 max_w => $::WIDTH * 0.44,
3289 fg => [@{ $item->{fg} }],
3290 can_events => 1,
3291 can_hover => 1
3292 };
3293
3294 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3295 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3296 $label->update;
3297 $label->set_max_size (undef, $label->{req_h} * $diff)
3298 if $diff < 1;
3299 $self->{timer}->interval (1/30);
3300 } else {
3301 $label->{fg}[3] = $item->{fg}[3] || 1;
3302 }
3303
3304 push @widgets, $label;
3305 }
3306
3307 $self->clear;
3308 $self->SUPER::add (reverse @widgets);
3309}
3310
3311sub add {
3312 my ($self, $text, %arg) = @_;
3313
3314 $text =~ s/^\s+//;
3315 $text =~ s/\s+$//;
3316
3317 return unless $text;
3318
3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3320
3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3322
3323 if (my $item = $self->{item}{$group}) {
3324 if ($item->{text} eq $text) {
3325 $item->{count}++;
3326 } else {
3327 $item->{count} = 1;
3328 $item->{text} = $item->{tooltip} = $text;
3329 }
3330 $item->{id} += 0.2;#d#
3331 $item->{timeout} = $timeout;
3332 delete $item->{label};
3333 } else {
3334 $self->{item}{$group} = {
3335 id => ++$self->{id},
3336 text => $text,
3337 timeout => $timeout,
3338 tooltip => $text,
3339 fg => [0.8, 0.8, 0.8, 0.8],
3340 pri => 0,
3341 count => 1,
3342 %arg,
3343 };
3344 }
3345
3346 $self->reorder;
3347}
3348
3349sub reconfigure {
3350 my ($self) = @_;
3351
3352 delete $_->{label}
3353 for values %{ $self->{item} || {} };
3354
3355 $self->reorder;
3356 $self->SUPER::reconfigure;
3357}
3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel;
3363
3364 $self->SUPER::destroy;
3365}
3366
3367#############################################################################
3368
3369package CFClient::UI::Inventory;
3370
3371our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373sub new {
3374 my $class = shift;
3375
3376 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378 @_,
3379 );
3380
3381 $self
3382}
3383
3384sub set_items {
3385 my ($self, $items) = @_;
3386
3387 $self->{child}->clear;
3388 return unless $items;
3389
3390 my @items = sort {
3391 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name})
3393 } @$items;
3394
3395 $self->{real_items} = \@items;
3396
3397 my $row = 0;
3398 for my $item (@items) {
3399 CFClient::Item::update_widgets $item;
3400
3401 $self->{child}->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget});
3404
3405 $row++;
3406 }
3407}
3408
3409#############################################################################
3410
3411package CFClient::UI::BindEditor;
3412
3413our @ISA = CFClient::UI::FancyFrame::;
3414
3415sub new {
3416 my $class = shift;
3417
3418 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420 $self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424 text => "start recording",
3425 tooltip => "Start/Stops recording of actions."
3426 ."All subsequent actions after the recording started will be captured."
3427 ."The actions are displayed after the record was stopped."
3428 ."To bind the action you have to click on the 'Bind' button",
3429 on_activate => sub {
3430 unless ($self->{recording}) {
3431 $self->start;
3432 } else {
3433 $self->stop;
3434 }
3435 });
3436
3437 $vb->add (new CFClient::UI::Label text => "Actions:");
3438 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3441 $vb->add (my $hb = new CFClient::UI::HBox);
3442 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443 $hb->add (new CFClient::UI::Button
3444 text => "bind",
3445 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446 on_activate => sub {
3447 $self->ask_for_bind;
3448 });
3449
3450 $vb->add (my $hb = new CFClient::UI::HBox);
3451 $hb->add (new CFClient::UI::Button
3452 text => "ok",
3453 expand => 1,
3454 tooltip => "This closes the binding editor and saves the binding",
3455 on_activate => sub {
3456 $self->hide;
3457 $self->commit;
3458 });
3459
3460 $hb->add (new CFClient::UI::Button
3461 text => "cancel",
3462 expand => 1,
3463 tooltip => "This closes the binding editor without saving",
3464 on_activate => sub {
3465 $self->hide;
3466 $self->{binding_cancel}->()
3467 if $self->{binding_cancel};
3468 });
3469
3470 $self->update_binding_widgets;
3471
3472 $self
3473}
3474
3475sub commit {
3476 my ($self) = @_;
3477 my ($mod, $sym, $cmds) = $self->get_binding;
3478 if ($sym != 0 && @$cmds > 0) {
3479 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480 ."'. Don't forget 'Save Config'!");
3481 $self->{binding_change}->($mod, $sym, $cmds)
3482 if $self->{binding_change};
3483 } else {
3484 $::STATUSBOX->add ("No action bound, no key or action specified!");
3485 $self->{binding_cancel}->()
3486 if $self->{binding_cancel};
3487 }
3488}
3489
3490sub start {
3491 my ($self) = @_;
3492
3493 $self->{rec_btn}->set_text ("stop recording");
3494 $self->{recording} = 1;
3495 $self->clear_command_list;
3496 $::CONN->start_record if $::CONN;
3497}
3498
3499sub stop {
3500 my ($self) = @_;
3501
3502 $self->{rec_btn}->set_text ("start recording");
3503 $self->{recording} = 0;
3504
3505 my $rec;
3506 $rec = $::CONN->stop_record if $::CONN;
3507 return unless ref $rec eq 'ARRAY';
3508 $self->set_command_list ($rec);
3509}
3510
3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3517sub ask_for_bind {
3518 my ($self, $commit, $end_cb) = @_;
3519
3520 CFClient::Binder::open_binding_dialog (sub {
3521 my ($mod, $sym) = @_;
3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523 $self->update_binding_widgets;
3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3526 });
3527}
3528
3529# $mod and $sym are the modifiers and key symbol
3530# $cmds is a array ref of strings (the commands)
3531# $cb is the callback that is executed on OK
3532# $ccb is the callback that is executed on CANCEL and
3533# when the binding was unsuccessful on OK
3534sub set_binding {
3535 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537 $self->clear_command_list;
3538 $self->{recording} = 0;
3539 $self->{rec_btn}->set_text ("start recording");
3540
3541 $self->{binding} = [$mod, $sym];
3542 $self->{commands} = $cmds;
3543
3544 $self->{binding_change} = $cb;
3545 $self->{binding_cancel} = $ccb;
3546
3547 $self->update_binding_widgets;
3548}
3549
3550# this is a shortcut method that asks for a binding
3551# and then just binds it.
3552sub do_quick_binding {
3553 my ($self, $cmds, $end_cb) = @_;
3554 $self->set_binding (undef, undef, $cmds, sub {
3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556 });
3557 $self->ask_for_bind (1, $end_cb);
3558}
3559
3560sub update_binding_widgets {
3561 my ($self) = @_;
3562 my ($mod, $sym, $cmds) = $self->get_binding;
3563 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564 $self->set_command_list ($cmds);
3565}
3566
3567sub get_binding {
3568 my ($self) = @_;
3569 return (
3570 $self->{binding}->[0],
3571 $self->{binding}->[1],
3572 [ grep { defined $_ } @{$self->{commands}} ]
3573 );
3574}
3575
3576sub clear_command_list {
3577 my ($self) = @_;
3578 $self->{cmdbox}->clear ();
3579}
3580
3581sub set_command_list {
3582 my ($self, $cmds) = @_;
3583
3584 $self->{cmdbox}->clear ();
3585 $self->{commands} = $cmds;
3586
3587 my $idx = 0;
3588
3589 for (@$cmds) {
3590 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592 my $i = $idx;
3593 $hb->add (new CFClient::UI::Label text => $_);
3594 $hb->add (new CFClient::UI::Button
3595 text => "delete",
3596 tooltip => "Deletes the action from the record",
3597 on_activate => sub {
3598 $self->{cmdbox}->remove ($hb);
3599 $cmds->[$i] = undef;
3600 });
3601
3602
3603 $idx++
3604 }
3605}
3606
3607#############################################################################
3608
3609package CFClient::UI::SpellList;
3610
3611our @ISA = CFClient::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 binding => [],
3618 commands => [],
2670 @_, 3619 @_,
2671 ) 3620 )
2672} 3621}
2673 3622
2674sub configure { 3623my $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 3624
2677 $self->{w} = $w; 3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2678 $self->{h} = $h; 3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2679} 3627my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2680 3635
2681sub check_size { 3636sub rebuild_spell_list {
3637 my ($self) = @_;
3638
3639 $CFClient::UI::ROOT->on_refresh ($self => sub {
3640 $self->clear;
3641
3642 return unless $::CONN;
3643
3644 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650 my $row = 0;
3651
3652 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653 my $spell = $self->{spell}{$_};
3654
3655 $row++;
3656
3657 my $spell_cb = sub {
3658 my ($widget, $ev) = @_;
3659
3660 if ($ev->{button} == 1) {
3661 $::CONN->user_send ("cast $spell->{name}");
3662 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu
3666 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ],
3670 )->popup ($ev);
3671 } else {
3672 return 0;
3673 }
3674
3675 1
3676 };
3677
3678 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680 #TODO: add path info to tooltip
3681 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683 $self->add (0, $row, new CFClient::UI::Face
3684 face => $spell->{face},
3685 can_hover => 1,
3686 can_events => 1,
3687 tooltip => $tooltip,
3688 on_button_down => $spell_cb,
3689 );
3690
3691 $self->add (1, $row, new CFClient::UI::Label
3692 expand => 1,
3693 text => $spell->{name},
3694 can_hover => 1,
3695 can_events => 1,
3696 tooltip => $tooltip,
3697 on_button_down => $spell_cb,
3698 );
3699
3700 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704 }
3705 });
3706}
3707
3708sub add_spell {
2682 my ($self) = @_; 3709 my ($self, $spell) = @_;
2683 3710
2684 $self->size_allocate ($self->{w}, $self->{h}) 3711 $self->{spell}->{$spell->{name}} = $spell;
2685 if $self->{w}; 3712 $self->rebuild_spell_list;
3713}
3714
3715sub remove_spell {
3716 my ($self, $spell) = @_;
3717
3718 delete $self->{spell}->{$spell->{name}};
3719 $self->rebuild_spell_list;
3720}
3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3726 $self->rebuild_spell_list;
3727}
3728
3729#############################################################################
3730
3731package CFClient::UI::Root;
3732
3733our @ISA = CFClient::UI::Container::;
3734
3735use List::Util qw(min max);
3736
3737use CFClient::OpenGL;
3738
3739sub new {
3740 my $class = shift;
3741
3742 my $self = $class->SUPER::new (
3743 visible => 1,
3744 @_,
3745 );
3746
3747 Scalar::Util::weaken ($self->{root} = $self);
3748
3749 $self
2686} 3750}
2687 3751
2688sub size_request { 3752sub size_request {
2689 my ($self) = @_; 3753 my ($self) = @_;
2690 3754
2691 ($self->{w}, $self->{h}) 3755 ($self->{w}, $self->{h})
2692} 3756}
2693 3757
3758sub _to_pixel {
3759 my ($coord, $size, $max) = @_;
3760
3761 $coord =
3762 $coord eq "center" ? ($max - $size) * 0.5
3763 : $coord eq "max" ? $max
3764 : $coord;
3765
3766 $coord = 0 if $coord < 0;
3767 $coord = $max - $size if $coord > $max - $size;
3768
3769 int $coord + 0.5
3770}
3771
2694sub size_allocate { 3772sub invoke_size_allocate {
2695 my ($self, $w, $h) = @_; 3773 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 3774
2713 for my $child ($self->children) { 3775 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3776 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715 3777
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3778 $X = $child->{force_x} if exists $child->{force_x};
2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3779 $Y = $child->{force_y} if exists $child->{force_y};
3780
3781 $X = _to_pixel $X, $W, $self->{w};
3782 $Y = _to_pixel $Y, $H, $self->{h};
3783
2718 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
2719 } 3785 }
2720 3786
2721 $self->{old_w} = $w; 3787 1
2722 $self->{old_h} = $h;
2723} 3788}
2724 3789
2725sub coord2local { 3790sub coord2local {
2726 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
2727 3792
… …
2735} 3800}
2736 3801
2737sub update { 3802sub update {
2738 my ($self) = @_; 3803 my ($self) = @_;
2739 3804
2740 $self->check_size;
2741 $::WANT_REFRESH++; 3805 $::WANT_REFRESH++;
2742} 3806}
2743 3807
2744sub add { 3808sub add {
2745 my ($self, $child) = @_; 3809 my ($self, @children) = @_;
2746 3810
2747 # integerise window positions 3811 $_->{is_toplevel} = 1
2748 $child->{x} = int $child->{x}; 3812 for @children;
2749 $child->{y} = int $child->{y};
2750 3813
2751 $self->SUPER::add ($child); 3814 $self->SUPER::add (@children);
3815}
3816
3817sub remove {
3818 my ($self, @children) = @_;
3819
3820 $self->SUPER::remove (@children);
3821
3822 delete $self->{is_toplevel}
3823 for @children;
3824
3825 while (@children) {
3826 my $w = pop @children;
3827 push @children, $w->children;
3828 $w->set_invisible;
3829 }
2752} 3830}
2753 3831
2754sub on_refresh { 3832sub on_refresh {
2755 my ($self, $id, $cb) = @_; 3833 my ($self, $id, $cb) = @_;
2756 3834
2757 $self->{refresh_hook}{$id} = $cb; 3835 $self->{refresh_hook}{$id} = $cb;
2758} 3836}
2759 3837
3838sub on_post_alloc {
3839 my ($self, $id, $cb) = @_;
3840
3841 $self->{post_alloc_hook}{$id} = $cb;
3842}
3843
2760sub draw { 3844sub draw {
2761 my ($self) = @_; 3845 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 3846
2807 while ($self->{refresh_hook}) { 3847 while ($self->{refresh_hook}) {
2808 $_->() 3848 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3849 for values %{delete $self->{refresh_hook}};
2810 } 3850 }
2811 3851
3852 if ($self->{realloc}) {
3853 my %queue;
3854 my @queue;
3855 my $widget;
3856
3857 outer:
3858 while () {
3859 if (my $realloc = delete $self->{realloc}) {
3860 for $widget (values %$realloc) {
3861 $widget->{visible} or next; # do not resize invisible widgets
3862
3863 $queue{$widget+0}++ and next; # duplicates are common
3864
3865 push @{ $queue[$widget->{visible}] }, $widget;
3866 }
3867 }
3868
3869 while () {
3870 @queue or last outer;
3871
3872 $widget = pop @{ $queue[-1] || [] }
3873 and last;
3874
3875 pop @queue;
3876 }
3877
3878 delete $queue{$widget+0};
3879
3880 my ($w, $h) = $widget->size_request;
3881
3882 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3883 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3888 $w = $widget->{force_w} if exists $widget->{force_w};
3889 $h = $widget->{force_h} if exists $widget->{force_h};
3890
3891 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3892 || delete $widget->{force_realloc}) {
3893 $widget->{req_w} = $w;
3894 $widget->{req_h} = $h;
3895
3896 $self->{size_alloc}{$widget+0} = $widget;
3897
3898 if (my $parent = $widget->{parent}) {
3899 $self->{realloc}{$parent+0} = $parent
3900 unless $queue{$parent+0};
3901
3902 $parent->{force_size_alloc} = 1;
3903 $self->{size_alloc}{$parent+0} = $parent;
3904 }
3905 }
3906
3907 delete $self->{realloc}{$widget+0};
3908 }
3909 }
3910
3911 while (my $size_alloc = delete $self->{size_alloc}) {
3912 my @queue = sort { $b->{visible} <=> $a->{visible} }
3913 values %$size_alloc;
3914
3915 while () {
3916 my $widget = pop @queue || last;
3917
3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919
3920 $w = 0 if $w < 0;
3921 $h = 0 if $h < 0;
3922
3923 $w = int $w + 0.5;
3924 $h = int $h + 0.5;
3925
3926 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927 $widget->{old_w} = $widget->{w};
3928 $widget->{old_h} = $widget->{h};
3929
3930 $widget->{w} = $w;
3931 $widget->{h} = $h;
3932
3933 $widget->emit (size_allocate => $w, $h);
3934 }
3935 }
3936 }
3937
3938 while ($self->{post_alloc_hook}) {
3939 $_->()
3940 for values %{delete $self->{post_alloc_hook}};
3941 }
3942
3943
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3944 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3945 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 3946 glClear GL_COLOR_BUFFER_BIT;
2815 3947
2816 glMatrixMode GL_PROJECTION; 3948 glMatrixMode GL_PROJECTION;
2817 glLoadIdentity; 3949 glLoadIdentity;
2818 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819 glMatrixMode GL_MODELVIEW; 3951 glMatrixMode GL_MODELVIEW;
2820 glLoadIdentity; 3952 glLoadIdentity;
2821 3953
3954 {
3955 package CFClient::UI::Base;
3956
3957 ($draw_x, $draw_y, $draw_w, $draw_h) =
3958 (0, 0, $self->{w}, $self->{h});
3959 }
3960
2822 $self->_draw; 3961 $self->_draw;
2823} 3962}
2824 3963
2825############################################################################# 3964#############################################################################
2826 3965
2827package CFClient::UI; 3966package CFClient::UI;
2828 3967
2829$ROOT = new CFClient::UI::Root; 3968$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 3969$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 3970
28321 39711
2833 3972

Diff Legend

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