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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC

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

Diff Legend

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