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

Diff Legend

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