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

Diff Legend

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