ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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