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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
23 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
24 32
25 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 36
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font}); 37 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 38 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 } 39 }
41 40
42 return; 41 return;
43 } 42 }
44 } 43 }
45 } 44 }
46 45
47 $TOOLTIP->hide; 46 $TOOLTIP->hide;
48 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;
49} 71}
50 72
51# class methods for events 73# class methods for events
52sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 76 if $FOCUS;
55} 77}
56 78
57sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 81 if $FOCUS;
60} 82}
61 83
62sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
63 my ($ev) = @_; 85 my ($ev) = @_;
… …
67 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
68 90
69 $GRAB = $widget; 91 $GRAB = $widget;
70 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
71 93
72 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
73 } 95 }
74 96
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 98
77 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 101}
82 102
83sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
84 my ($ev) = @_; 104 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
86 106
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 108
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 110
91 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 113
96 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 116 $grab->update if $grab;
99 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
100 118
101 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
102 } 120 }
103} 121}
104 122
105sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
106 my ($ev) = @_; 124 my ($ev) = @_;
… …
112 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
113 131
114 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 134
117 check_tooltip; 135 $TOOLTIP_WATCHER->start;
118 } 136 }
119 137
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 139 if $HOVER;
124} 140}
125 141
126# convert position array to integers 142# convert position array to integers
127sub harmonize { 143sub harmonize {
128 my ($vals) = @_; 144 my ($vals) = @_;
… …
134 $rem += $_ - $i; 150 $rem += $_ - $i;
135 $_ = $i; 151 $_ = $i;
136 } 152 }
137} 153}
138 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
139############################################################################# 196#############################################################################
140 197
141package CFClient::UI::Base; 198package CFClient::UI::Base;
142 199
143use strict; 200use strict;
… …
146 203
147sub new { 204sub new {
148 my $class = shift; 205 my $class = shift;
149 206
150 my $self = bless { 207 my $self = bless {
151 x => 0, 208 x => "center",
152 y => 0, 209 y => "center",
153 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
154 can_events => 1, 213 can_events => 1,
155 @_ 214 @_
156 }, $class; 215 }, $class;
157 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
158 for (keys %$self) { 219 for (keys %$self) {
159 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
161 } 222 }
162 } 223 }
163 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
164 $self 237 $self
165} 238}
166 239
167sub destroy { 240sub destroy {
168 my ($self) = @_; 241 my ($self) = @_;
… …
177 return if $self->{parent}; 250 return if $self->{parent};
178 251
179 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
180} 253}
181 254
182sub hide { 255sub set_visible {
183 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};
184 279
185 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
187 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
188 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
189 if $self->{parent}; 313 if $self->{parent};
190} 314}
191 315
192sub move { 316sub move_abs {
193 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
194 318
195 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
196 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
197 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
198 322
199 $self->update; 323 $self->update;
200} 324}
201 325
202sub set_size { 326sub set_size {
203 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
204 328
205 $self->{user_w} = $w; 329 $self->{force_w} = $w;
206 $self->{user_h} = $h; 330 $self->{force_h} = $h;
207 331
208 $self->check_size; 332 $self->realloc;
209} 333}
210 334
211sub size_request { 335sub size_request {
212 require Carp; 336 require Carp;
213 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
214} 338}
215 339
340sub baseline_shift {
341 0
342}
343
216sub configure { 344sub configure {
217 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
218 346
219 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
220 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
222 352
223 # use alignment to adjust x, y 353 # use alignment to adjust x, y
224 354
225 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
226 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
227
228 ($w, $h) = ($w2, $h2);
229 } 357 }
230 358
231 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
232 $self->{x} = $x; 360 $self->{x} = $x;
233 $self->{y} = $y; 361 $self->{y} = $y;
234 $self->update; 362 $self->update;
235 } 363 }
236 364
237 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
239 }
240}
241 367
242sub size_allocate { 368 $self->{alloc_w} = $w;
243 # nothing to be done 369 $self->{alloc_h} = $h;
370
371 $self->{root}{size_alloc}{$self+0} = $self;
372 }
244} 373}
245 374
246sub children { 375sub children {
376 # nop
247} 377}
248 378
249# call when resolution changes etc. 379sub visible_children {
250sub reconfigure { 380 $_[0]->children
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 381}
260 382
261sub set_max_size { 383sub set_max_size {
262 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
263 385
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
390}
391
392sub set_tooltip {
393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
400 $self->{tooltip} = $tooltip;
401
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 }
266} 406}
267 407
268# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
269sub coord2local { 409sub coord2local {
270 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
… …
277 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
278 418
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 420}
281 421
282sub focus_in { 422sub invoke_focus_in {
283 my ($self) = @_; 423 my ($self) = @_;
284 424
285 return if $FOCUS == $self; 425 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
287 427
288 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
289 429
290 $self->emit (focus_in => $focus);
291
292 $focus->update if $focus; 430 $focus->update if $focus;
293 $FOCUS->update; 431 $FOCUS->update;
294}
295 432
433 0
434}
435
296sub focus_out { 436sub invoke_focus_out {
297 my ($self) = @_; 437 my ($self) = @_;
298 438
299 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
300 440
301 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
302 442
303 $self->emit (focus_out => $focus);
304
305 $focus->update if $focus; #? 443 $focus->update if $focus; #?
306}
307 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
308sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
309sub button_up { } 458sub invoke_button_up { 1 }
310sub key_down { } 459sub invoke_key_down { 1 }
311sub key_up { } 460sub invoke_key_up { 1 }
312 461
313sub button_down { 462sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
315 464
316 $self->focus_in; 465 $self->grab_focus;
317}
318 466
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
323sub 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
324 535
325sub draw { 536sub draw {
326 my ($self) = @_; 537 my ($self) = @_;
327 538
328 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);
329 550
330 glPushMatrix; 551 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 553
335 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 556 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 558 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 559 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
359 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;
360 glPopMatrix; 577 glPopMatrix;
361 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;
362 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
363} 583}
364 584
365sub _draw { 585sub _draw {
366 my ($self) = @_; 586 my ($self) = @_;
367 587
368 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
369} 589}
370 590
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
390}
391
392sub check_size {
393 my ($self) = @_;
394
395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396}
397
398sub update {
399 my ($self) = @_;
400
401 $self->{parent}->update
402 if $self->{parent};
403}
404
405sub connect {
406 my ($self, $signal, $cb) = @_;
407
408 push @{ $self->{signal_cb}{$signal} }, $cb;
409}
410
411sub emit {
412 my ($self, $signal, @args) = @_;
413
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
415}
416
417sub DESTROY { 591sub DESTROY {
418 my ($self) = @_; 592 my ($self) = @_;
419 593
420 #$self->deactivate; 594 delete $WIDGET{$self+0};
595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
421} 598}
422 599
423############################################################################# 600#############################################################################
424 601
425package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
433 my $class = shift; 610 my $class = shift;
434 611
435 # range [value, low, high, page] 612 # range [value, low, high, page]
436 613
437 $class->SUPER::new ( 614 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 615 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 616 #active_bg => [1, 1, 1, 0.5],
440 @_ 617 @_
441 ) 618 )
442} 619}
443 620
444sub _draw { 621sub _draw {
445 my ($self) = @_; 622 my ($self) = @_;
446 623
624 my $color = $FOCUS == $self && $self->{active_bg}
625 ? $self->{active_bg}
626 : $self->{bg};
627
628 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
448 630
449 glEnable GL_BLEND; 631 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 633 glColor_premultiply @$color;
452 634
453 glBegin GL_QUADS; 635 glBegin GL_QUADS;
454 glVertex 0 , 0; 636 glVertex 0 , 0;
455 glVertex 0 , $h; 637 glVertex 0 , $h;
456 glVertex $w, $h; 638 glVertex $w, $h;
457 glVertex $w, 0; 639 glVertex $w, 0;
458 glEnd; 640 glEnd;
459 641
460 glDisable GL_BLEND; 642 glDisable GL_BLEND;
643 }
461} 644}
462 645
463############################################################################# 646#############################################################################
464 647
465package CFClient::UI::Empty; 648package CFClient::UI::Empty;
… …
470 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
472} 655}
473 656
474sub size_request { 657sub size_request {
475 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
476} 661}
477 662
478sub draw { } 663sub draw { }
479 664
480############################################################################# 665#############################################################################
… …
484our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
485 670
486sub new { 671sub new {
487 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
488 673
489 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
490 675
491 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
492 children => [], 677 children => [],
493 can_events => 0, 678 can_events => 0,
494 %arg, 679 %arg,
495 ); 680 );
681
496 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
497 684
498 $self 685 $self
499} 686}
500 687
501sub add { 688sub add {
… …
509 $self->{children} = [ 696 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
512 ]; 699 ];
513 700
514 $self->check_size; 701 $self->realloc;
515 $self->update;
516} 702}
517 703
518sub children { 704sub children {
519 @{ $_[0]{children} } 705 @{ $_[0]{children} }
520} 706}
… …
525 delete $child->{parent}; 711 delete $child->{parent};
526 $child->hide; 712 $child->hide;
527 713
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 715
530 $self->check_size; 716 $self->realloc;
531 $self->update;
532} 717}
533 718
534sub clear { 719sub clear {
535 my ($self) = @_; 720 my ($self) = @_;
536 721
… …
540 for (@$children) { 725 for (@$children) {
541 delete $_->{parent}; 726 delete $_->{parent};
542 $_->hide; 727 $_->hide;
543 } 728 }
544 729
545 $self->check_size; 730 $self->realloc;
546 $self->update;
547} 731}
548 732
549sub find_widget { 733sub find_widget {
550 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
551 735
552 $x -= $self->{x}; 736 $x -= $self->{x};
553 $y -= $self->{y}; 737 $y -= $self->{y};
554 738
555 my $res; 739 my $res;
556 740
557 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
558 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
559 and return $res; 743 and return $res;
560 } 744 }
561 745
562 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
583} 767}
584 768
585sub add { 769sub add {
586 my ($self, $child) = @_; 770 my ($self, $child) = @_;
587 771
588 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
589
590 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
591} 774}
592 775
593sub remove { 776sub remove {
594 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
603 786
604sub size_request { 787sub size_request {
605 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
606} 789}
607 790
608sub size_allocate { 791sub invoke_size_allocate {
609 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
610 793
611 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
612} 797}
613 798
614############################################################################# 799#############################################################################
800
801# back-buffered drawing area
615 802
616package CFClient::UI::Window; 803package CFClient::UI::Window;
617 804
618our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
619 806
… …
626} 813}
627 814
628sub update { 815sub update {
629 my ($self) = @_; 816 my ($self) = @_;
630 817
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 819 $self->SUPER::update;
633} 820}
634 821
635sub size_allocate { 822sub invoke_size_allocate {
636 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
637 824
638 $self->SUPER::size_allocate ($w, $h);
639 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
640} 828}
641 829
642sub _render { 830sub _render {
831 my ($self) = @_;
832
643 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
644} 834}
645 835
646sub render_child { 836sub render_child {
647 my ($self) = @_; 837 my ($self) = @_;
648 838
649 $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 {
650 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
652 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
653 $self->_render; 850 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 851 };
662} 852}
663 853
664sub _draw { 854sub _draw {
665 my ($self) = @_; 855 my ($self) = @_;
666 856
667 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
668 858
669 my $tex = $self->{texture} 859 my $tex = $self->{texture}
670 or return; 860 or return;
671 861
672 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
… …
682 872
683package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
684 874
685our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
686 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
687sub size_request { 887sub size_request {
688 my ($self) = @_; 888 my ($self) = @_;
689 889
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 891
693 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
694} 893 $h = 10 if $self->{scroll_y};
695 894
895 ($w, $h)
896}
897
696sub size_allocate { 898sub invoke_size_allocate {
697 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
698 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);
699 $self->update; 907 $self->update;
908
909 1
700} 910}
701 911
702sub set_offset { 912sub set_offset {
703 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
704 914
… …
737} 947}
738 948
739sub _render { 949sub _render {
740 my ($self) = @_; 950 my ($self) = @_;
741 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
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743 956
744 $self->SUPER::_render; 957 $self->SUPER::_render;
745} 958}
746 959
747############################################################################# 960#############################################################################
748 961
749package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
750 963
751our @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;
752 1028
753sub new { 1029sub new {
754 my $class = shift; 1030 my $class = shift;
755 1031
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new ( 1032 $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 1033 bg => undef,
768 slider => $slider,
769 @_, 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,
770 ); 1088 );
771 1089
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
781
782#############################################################################
783
784package CFClient::UI::Frame;
785
786our @ISA = CFClient::UI::Bin::;
787
788use CFClient::OpenGL;
789
790sub new {
791 my $class = shift;
792
793 my $self = $class->SUPER::new (
794 bg => [1, 1, 1, 1],
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_
798 );
799
800 $self
801}
802
803sub _draw {
804 my ($self) = @_;
805
806 my ($w, $h) = ($self->{w}, $self->{h});
807
808 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812
813# glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0;
816# glVertex 0 , $h;
817# glVertex $w, $h;
818# glVertex $w, 0;
819# glEnd;
820
821
822 $self->child->draw;
823 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D;
825}
826
827#############################################################################
828
829package CFClient::UI::FancyFrame;
830
831our @ISA = CFClient::UI::Bin::;
832
833use CFClient::OpenGL;
834
835my @tex =
836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838
839sub new {
840 my $class = shift;
841
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1],
847 border => 0.6,
848 can_events => 1,
849 @_
850 );
851
852 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
853 align => 0, 1091 align => 0,
854 valign => 1, 1092 valign => 1,
855 text => $self->{title}, 1093 text => $self->{title},
856 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 }
857 1105
858 $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};
859} 1115}
860 1116
861sub border { 1117sub border {
862 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
863} 1119}
864 1120
865sub size_request { 1121sub size_request {
866 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};
867 1129
868 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
869 1131
870 ( 1132 (
871 $w + $self->border * 2, 1133 $w + $self->border * 2,
872 $h + $self->border * 2, 1134 $h + $self->border * 2,
873 ) 1135 )
874} 1136}
875 1137
876sub size_allocate { 1138sub invoke_size_allocate {
877 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
878 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
879 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
881 1151
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
883 if $self->{title};
884
885 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
886}
887 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
888sub button_down { 1160sub invoke_button_down {
889 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
890 1162
891 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
892 my $border = $self->border; 1164 my $border = $self->border;
893 1165
… …
906 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
907 1179
908 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
910 1182
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1185
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
914 $self->check_size; 1187 $self->realloc;
915 }; 1188 };
916 1189
917 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
919 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
921 $self->{motion} = sub { 1194 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
923 1196
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
925 1198
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
927 $self->update; 1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
928 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
929 } 1207 1
930} 1208}
931 1209
932sub button_up { 1210sub invoke_button_up {
933 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
934 1212
935 delete $self->{motion}; 1213 ! ! delete $self->{motion}
936} 1214}
937 1215
938sub mouse_motion { 1216sub invoke_mouse_motion {
939 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
940 1218
941 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
942} 1222}
943 1223
944sub _draw { 1224sub _draw {
945 my ($self) = @_; 1225 my ($self) = @_;
946 1226
1227 my $child = $self->{children}[0];
1228
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
949 1231
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1234
955 my $border = $self->border; 1235 my $border = $self->border;
956 1236
957 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1242
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
965 1245
966 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
967 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
968 my $rep_y = $ch / $bg->{h}; 1249 $bg->{t} = $ch / $bg->{h};
969
970 glColor @{ $self->{bg} };
971
972 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1251 }
976 1252
977 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1254
981 $self->{title}->draw if $self->{title};
982
983 $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};
984} 1266}
985 1267
986############################################################################# 1268#############################################################################
987 1269
988package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
996sub new { 1278sub new {
997 my $class = shift; 1279 my $class = shift;
998 1280
999 $class->SUPER::new ( 1281 $class->SUPER::new (
1000 col_expand => [], 1282 col_expand => [],
1001 @_ 1283 @_,
1002 ) 1284 )
1285}
1286
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1289}
1004 1290
1005sub add { 1291sub add {
1006 my ($self, $x, $y, $child) = @_; 1292 my ($self, $x, $y, $child) = @_;
1007 1293
1008 $child->set_parent ($self); 1294 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1010 1296
1011 $child->check_size; 1297 $self->realloc;
1012} 1298}
1013 1299
1014sub children { 1300sub remove {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1301 my ($self, $child) = @_;
1016}
1017 1302
1303 # TODO: not yet implemented
1304}
1305
1018# 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?
1019sub clear { 1307sub clear {
1020 my ($self) = @_; 1308 my ($self) = @_;
1021 1309
1022 my @children = $self->children; 1310 my @children = $self->children;
1023 delete $self->{children}; 1311 delete $self->{children};
… …
1025 for (@children) { 1313 for (@children) {
1026 delete $_->{parent}; 1314 delete $_->{parent};
1027 $_->hide; 1315 $_->hide;
1028 } 1316 }
1029 1317
1030 $self->update; 1318 $self->realloc;
1031} 1319}
1032 1320
1033sub get_wh { 1321sub get_wh {
1034 my ($self) = @_; 1322 my ($self) = @_;
1035 1323
… …
1061 (sum @$ws), 1349 (sum @$ws),
1062 (sum @$hs), 1350 (sum @$hs),
1063 ) 1351 )
1064} 1352}
1065 1353
1066sub size_allocate { 1354sub invoke_size_allocate {
1067 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1068 1356
1069 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1070 1358
1071 my $req_w = sum @$ws; 1359 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1360 my $req_h = (sum @$hs) || 1;
1073 1361
1074 # TODO: nicer code && do row_expand 1362 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1363 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1364 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1365 my $col_expand = (sum @col_expand) || 1;
… …
1103 } 1391 }
1104 1392
1105 $y += $row_h; 1393 $y += $row_h;
1106 } 1394 }
1107 1395
1396 1
1108} 1397}
1109 1398
1110sub find_widget { 1399sub find_widget {
1111 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1112 1401
… …
1131 } 1420 }
1132} 1421}
1133 1422
1134############################################################################# 1423#############################################################################
1135 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
1136package CFClient::UI::HBox; 1485package CFClient::UI::HBox;
1137 1486
1138# TODO: wrap into common Box base class
1139
1140our @ISA = CFClient::UI::Container::; 1487our @ISA = CFClient::UI::Box::;
1141 1488
1142sub size_request { 1489sub new {
1143 my ($self) = @_; 1490 my $class = shift;
1144 1491
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1492 $class->SUPER::new (
1146 1493 vertical => 0,
1147 ( 1494 @_,
1148 (List::Util::sum map $_->[0], @alloc),
1149 (List::Util::max map $_->[1], @alloc),
1150 ) 1495 )
1151} 1496}
1152 1497
1153sub size_allocate {
1154 my ($self, $w, $h) = @_;
1155
1156 ($h, $w) = ($w, $h);
1157
1158 my $children = $self->{children};
1159
1160 my @h = map $_->{req_w}, @$children;
1161
1162 my $req_h = List::Util::sum @h;
1163
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children;
1169 $exp ||= 1;
1170
1171 for (0 .. $#$children) {
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 }
1178 }
1179
1180 CFClient::UI::harmonize \@h;
1181
1182 my $y = 0;
1183 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_];
1186 $child->configure ($y, 0, $h, $w);
1187
1188 $y += $h;
1189 }
1190
1191 1
1192}
1193
1194############################################################################# 1498#############################################################################
1195 1499
1196package CFClient::UI::VBox; 1500package CFClient::UI::VBox;
1197 1501
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1502our @ISA = CFClient::UI::Box::;
1201 1503
1202sub size_request { 1504sub new {
1203 my ($self) = @_; 1505 my $class = shift;
1204 1506
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1507 $class->SUPER::new (
1206 1508 vertical => 1,
1207 ( 1509 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1510 )
1211} 1511}
1212 1512
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1513#############################################################################
1253 1514
1254package CFClient::UI::Label; 1515package CFClient::UI::Label;
1255 1516
1256our @ISA = CFClient::UI::Base::; 1517our @ISA = CFClient::UI::DrawBG::;
1257 1518
1258use CFClient::OpenGL; 1519use CFClient::OpenGL;
1259 1520
1260sub new { 1521sub new {
1261 my ($class, %arg) = @_; 1522 my ($class, %arg) = @_;
1262 1523
1263 my $self = $class->SUPER::new ( 1524 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1525 fg => [1, 1, 1],
1526 #bg => none
1527 #active_bg => none
1265 #font => default_font 1528 #font => default_font
1266 #text => initial text 1529 #text => initial text
1267 #markup => initial narkup 1530 #markup => initial narkup
1531 #max_w => maximum pixel width
1532 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1269 fontsize => 1, 1534 fontsize => 1,
1270 align => -1, 1535 align => -1,
1271 valign => -1, 1536 valign => -1,
1272 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1273 can_events => 0, 1539 can_events => 0,
1274 %arg 1540 %arg
1275 ); 1541 );
1276 1542
1277 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1287 } 1553 }
1288 1554
1289 $self 1555 $self
1290} 1556}
1291 1557
1292sub escape { 1558sub escape($) {
1293 local $_ = $_[1]; 1559 local $_ = $_[0];
1294 1560
1295 s/&/&amp;/g; 1561 s/&/&amp;/g;
1296 s/>/&gt;/g; 1562 s/>/&gt;/g;
1297 s/</&lt;/g; 1563 s/</&lt;/g;
1298 1564
1299 $_[1] 1565 $_
1300} 1566}
1301 1567
1302sub update { 1568sub update {
1303 my ($self) = @_; 1569 my ($self) = @_;
1304 1570
1305 delete $self->{texture}; 1571 delete $self->{texture};
1306 $self->SUPER::update; 1572 $self->SUPER::update;
1307} 1573}
1308 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1309sub set_text { 1582sub set_text {
1310 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1311 1584
1312 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1314 1587
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1317 1590
1591 delete $self->{size_req};
1592 $self->realloc;
1318 $self->update; 1593 $self->update;
1319 $self->check_size;
1320} 1594}
1321 1595
1322sub set_markup { 1596sub set_markup {
1323 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1324 1598
… …
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1603
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1331 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1332 1606
1607 delete $self->{size_req};
1608 $self->realloc;
1333 $self->update; 1609 $self->update;
1334 $self->check_size;
1335} 1610}
1336 1611
1337sub size_request { 1612sub size_request {
1338 my ($self) = @_; 1613 my ($self) = @_;
1339 1614
1615 $self->{size_req} ||= do {
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $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});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1621
1344 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1345 1623
1346 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1347 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1627
1350 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1351 1629
1352 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1354 } 1635 };
1355 1636
1356 ( 1637 @{ $self->{size_req} }
1357 $w + $self->{padding} * 2,
1358 $h + $self->{padding} * 2,
1359 )
1360} 1638}
1361 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1362sub size_allocate { 1644sub invoke_size_allocate {
1363 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1364 1646
1647 delete $self->{ox};
1648
1365 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1366} 1653}
1367 1654
1368sub set_fontsize { 1655sub set_fontsize {
1369 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1370 1657
1371 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1372 delete $self->{texture}; 1659 delete $self->{texture};
1373 1660
1374 $self->update; 1661 $self->realloc;
1375 $self->check_size; 1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1376} 1670}
1377 1671
1378sub _draw { 1672sub _draw {
1379 my ($self) = @_; 1673 my ($self) = @_;
1674
1675 $self->SUPER::_draw; # draw background, if applicable
1380 1676
1381 my $tex = $self->{texture} ||= do { 1677 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1678 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1679 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $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});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1684
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1398 }; 1686 };
1399 1687
1688 unless (exists $self->{ox}) {
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
1400 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1402 1702
1403 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1404 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1406 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1408 } 1710 }
1409 1711
1410 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1411} 1713}
1412 1714
… …
1428 active_fg => [0, 0, 0], 1730 active_fg => [0, 0, 0],
1429 can_hover => 1, 1731 can_hover => 1,
1430 can_focus => 1, 1732 can_focus => 1,
1431 valign => 0, 1733 valign => 0,
1432 can_events => 1, 1734 can_events => 1,
1735 #text => ...
1736 #hidden => "*",
1433 @_ 1737 @_
1434 ) 1738 )
1435} 1739}
1436 1740
1437sub _set_text { 1741sub _set_text {
… …
1439 1743
1440 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1441 1745
1442 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1443 1747
1444 delete $self->{texture};
1445
1446 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1447 $self->{text} = $text; 1749 $self->{text} = $text;
1448 1750
1449 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1451 1754
1452 $self->emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1453} 1759}
1454 1760
1455sub set_text { 1761sub set_text {
1456 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1457 1763
1458 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1765 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462} 1766}
1463 1767
1464sub get_text { 1768sub get_text {
1465 $_[0]{text} 1769 $_[0]{text}
1466} 1770}
… …
1471 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1472 1776
1473 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1474} 1778}
1475 1779
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480}
1481
1482sub key_down { 1780sub invoke_key_down {
1483 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1484 1782
1485 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1486 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
1488 1786
1489 my $text = $self->get_text; 1787 my $text = $self->get_text;
1490 1788
1491 if ($sym == 8) { 1789 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1791 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1792 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1793 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1794 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1795 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1796 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1801 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1802 $self->emit ('escape');
1505 } elsif ($uni) { 1803 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1507 } 1807 }
1508 1808
1509 $self->_set_text ($text); 1809 $self->_set_text ($text);
1510 $self->update;
1511}
1512 1810
1811 $self->realloc;
1812
1813 1
1814}
1815
1513sub focus_in { 1816sub invoke_focus_in {
1514 my ($self) = @_; 1817 my ($self) = @_;
1515 1818
1516 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1517 1820
1518 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1519} 1822}
1520 1823
1521sub button_down { 1824sub invoke_button_down {
1522 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1523 1826
1524 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1525 1828
1526 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1527 1830
1528 # byte-index to char-index 1831 # byte-index to char-index
1529 my $text = $self->{text}; 1832 my $text = $self->{text};
1530 utf8::encode $text; 1833 utf8::encode $text;
1531 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1532 1835
1533 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1534 $self->update; 1837 $self->update;
1838
1839 1
1535} 1840}
1536 1841
1537sub mouse_motion { 1842sub invoke_mouse_motion {
1538 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1539# 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
1540} 1847}
1541 1848
1542sub _draw { 1849sub _draw {
1543 my ($self) = @_; 1850 my ($self) = @_;
1544 1851
1545 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1546 1853
1547 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1548 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1549 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1550 } else { 1857 } else {
1551 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1552 } 1859 }
1553 1860
1554 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1555 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1556 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1557 glVertex 0 , 0; 1864 glVertex 0 , 0;
1558 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1559 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1560 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1585 1892
1586our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1587 1894
1588use CFClient::OpenGL; 1895use CFClient::OpenGL;
1589 1896
1590sub key_down { 1897sub invoke_key_down {
1591 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1592 1899
1593 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1594 1901
1595 if ($sym == 13) { 1902 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1598 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1908 $self->emit (activate => $txt);
1601 $self->update; 1909 $self->update;
1602 1910
… …
1621 } else { 1929 } else {
1622 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1623 } 1931 }
1624 1932
1625 } else { 1933 } else {
1626 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1627 } 1937 1
1628
1629} 1938}
1630 1939
1631############################################################################# 1940#############################################################################
1632 1941
1633package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1642 1951
1643sub new { 1952sub new {
1644 my $class = shift; 1953 my $class = shift;
1645 1954
1646 $class->SUPER::new ( 1955 $class->SUPER::new (
1647 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1648 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1651 can_hover => 1, 1960 can_hover => 1,
1652 align => 0, 1961 align => 0,
1653 valign => 0, 1962 valign => 0,
1654 can_events => 1, 1963 can_events => 1,
1655 @_ 1964 @_
1656 ) 1965 )
1657} 1966}
1658 1967
1659sub button_up { 1968sub invoke_button_up {
1660 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1661 1970
1971 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1973 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate"); 1974
1665 } 1975 1
1666} 1976}
1667 1977
1668sub _draw { 1978sub _draw {
1669 my ($self) = @_; 1979 my ($self) = @_;
1670 1980
1671 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1672
1673 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg};
1675 }
1676 1982
1677 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1679 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1680 1986
… …
1685 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1686} 1992}
1687 1993
1688############################################################################# 1994#############################################################################
1689 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
2028}
2029
2030#############################################################################
2031
1690package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1691 2033
1692our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1693 2035
1694my @tex = 2036my @tex =
… …
1699 2041
1700sub new { 2042sub new {
1701 my $class = shift; 2043 my $class = shift;
1702 2044
1703 $class->SUPER::new ( 2045 $class->SUPER::new (
1704 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1705 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1706 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],
1707 state => 0, 2052 state => 0,
1708 can_hover => 1, 2053 can_hover => 1,
1709 @_ 2054 @_
1710 ) 2055 )
1711} 2056}
1712 2057
1713sub size_request { 2058sub size_request {
1714 my ($self) = @_; 2059 my ($self) = @_;
1715 2060
1716 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1717} 2062}
1718 2063
1719sub button_down { 2064sub invoke_button_down {
1720 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1721 2066
1722 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1723 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1724 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1725 $self->emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1726 } 2075 1
1727} 2076}
1728 2077
1729sub _draw { 2078sub _draw {
1730 my ($self) = @_; 2079 my ($self) = @_;
1731 2080
1732 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1733 2082
1734 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1735 2084
1736 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;
1737 2088
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
1740 glEnable GL_TEXTURE_2D; 2093 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 2094 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 2095 glDisable GL_TEXTURE_2D;
1747} 2096}
1748 2097
1749############################################################################# 2098#############################################################################
1750 2099
1751package CFClient::UI::Image; 2100package CFClient::UI::Image;
1752 2101
1753our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1754 2103
1755use CFClient::OpenGL; 2104use CFClient::OpenGL;
1756use Carp qw/confess/;
1757 2105
1758our %loaded_images; 2106our %texture_cache;
1759 2107
1760sub new { 2108sub new {
1761 my $class = shift; 2109 my $class = shift;
1762 2110
1763 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1764 2115
1765 $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";
1766 2118
1767 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1768 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;
1769 2121
1770 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1771 2123
1772 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1773
1774 $self->{aspect} = $tex->{w} / $tex->{h};
1775 2125
1776 $self 2126 $self
1777} 2127}
1778 2128
1779sub size_request { 2129sub size_request {
1780 my ($self) = @_; 2130 my ($self) = @_;
1781 2131
1782 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1783} 2133}
1784 2134
1785sub _draw { 2135sub _draw {
1786 my ($self) = @_; 2136 my ($self) = @_;
1787 2137
… …
1898 2248
1899 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
1901 2251
1902 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1904 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1906 2257
1907 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
1908 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2348 qw(s1_slider.png s1_slider_bg.png);
1998 2349
1999sub new { 2350sub new {
2000 my $class = shift; 2351 my $class = shift;
2001 2352
2002 # range [value, low, high, page] 2353 # range [value, low, high, page, unit]
2003 2354
2004 # TODO: 0-width page 2355 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2356 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2357 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2358 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2361 bg => [0, 0, 0, 0.2],
2362 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2363 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2013 vertical => 0, 2366 vertical => 0,
2014 can_hover => 1, 2367 can_hover => 1,
2015 inner_pad => 5, 2368 inner_pad => 0.02,
2016 @_ 2369 @_
2017 ); 2370 );
2018 2371
2372 $self->set_value ($self->{range}[0]);
2373 $self->update;
2374
2019 $self 2375 $self
2020} 2376}
2021 2377
2378sub set_range {
2379 my ($self, $range) = @_;
2380
2381 ($range, $self->{range}) = ($self->{range}, $range);
2382
2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2387}
2388
2389sub set_value {
2390 my ($self, $value) = @_;
2391
2392 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2393
2394 $hi = $lo + 1 if $hi <= $lo;
2395
2396 $page = $hi - $lo if $page > $hi - $lo;
2397
2398 $value = $lo if $value < $lo;
2399 $value = $hi - $page if $value > $hi - $page;
2400
2401 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2402 if $unit;
2403
2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2405
2406 if ($value != $old_value) {
2407 $self->emit (changed => $value);
2408 $self->update;
2409 }
2410}
2411
2022sub size_request { 2412sub size_request {
2023 my ($self) = @_; 2413 my ($self) = @_;
2024 2414
2025 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2026 my $h = $self->{req_h};
2027
2028 $self->{vertical} ? ($h, $w) : ($w, $h)
2029} 2416}
2030 2417
2031sub button_down { 2418sub invoke_button_down {
2032 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2033 2420
2034 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2422
2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424
2035 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2036} 2426}
2037 2427
2038sub mouse_motion { 2428sub invoke_mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2040 2430
2041 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2433
2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2435
2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2437
2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2443 1
2444}
2445
2446sub update {
2447 my ($self) = @_;
2448
2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2457 $self->set_value ($self->{range}[0]);
2458
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2460 my $range = ($hi - $page - $lo) || 1e-100;
2043 2461
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2462 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2463
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2464 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2465 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2466
2049 $x -= $inner_pad_px; # substract the padding 2467 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2468 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2469
2055 $self->emit (changed => $x); 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2471 $self->{knob_w} = $knob_w;
2057 } 2472 }
2058}
2059
2060# the inner_* stuff is for generating a padding for the slider handle,
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066}
2067
2068sub _draw {
2069 my ($self) = @_;
2070 2473
2071 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2072 2475
2073 my ($w, $h) = @$self{qw(w h)}; 2476 glScale $self->{w}, $self->{h};
2074 2477
2075 if ($self->{vertical}) { 2478 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2479 # draw a vertical slider like a rotated horizontal slider
2077 2480
2481 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2482 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2483 }
2083 2484
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2485 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2486 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2487
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2488 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2489 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2490
2108 # draw background 2491 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2492 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2493
2111 # draw handle 2494 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2495 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2496
2114 glDisable GL_TEXTURE_2D; 2497 glDisable GL_TEXTURE_2D;
2115} 2498}
2116 2499
2117############################################################################# 2500#############################################################################
2118 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
2119package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2120 2544
2121our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2122 2546
2123use CFClient::OpenGL; 2547use CFClient::OpenGL;
2124 2548
… …
2126 my $class = shift; 2550 my $class = shift;
2127 2551
2128 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2129 fontsize => 1, 2553 fontsize => 1,
2130 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2131 #font => default_font 2556 #font => default_font
2132 @_, 2557 @_,
2133 2558
2134 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2135 par => [], 2560 par => [],
… …
2150 2575
2151 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2577 $self->reflow;
2153} 2578}
2154 2579
2155sub 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 {
2156 my ($self, $text) = @_; 2603 my ($self, $para) = @_;
2157 2604
2158 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2159 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w}); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2162 $layout->set_markup ($text); 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}}
2163 2618 );
2164 ($layout->size)[1] 2619
2620 $layout
2165} 2621}
2166 2622
2167sub reflow { 2623sub reflow {
2168 my ($self) = @_; 2624 my ($self) = @_;
2169 2625
2170 $self->{need_reflow}++; 2626 $self->{need_reflow}++;
2171 $self->update; 2627 $self->update;
2172} 2628}
2173 2629
2174sub 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 {
2175 my ($self, $w, $h) = @_; 2638 my ($self) = @_;
2176 2639
2177 $self->SUPER::size_allocate ($w, $h); 2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2178 2642
2179 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2643 $self->{par} = [];
2180 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2644 $self->{height} = 0;
2181 $self->{layout}->set_width ($self->{children}[0]{w}); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2182
2183 $self->reflow;
2184} 2646}
2185 2647
2186sub add_paragraph { 2648sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2188 2650
2189 #TODO: intelligently "reformat" paragraph 2651 my ($text, @w) = ref $para ? @$para : $para;
2190 2652
2191 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 };
2192 2661
2193 $self->{height} += $height; 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2194 2664
2195 push @{$self->{par}}, [$height, $color, $text]; 2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2196 2668
2197 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2669sub scroll_to_bottom {
2198 $self->{children}[1]->update; 2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2199} 2674}
2200 2675
2201sub update { 2676sub update {
2202 my ($self) = @_; 2677 my ($self) = @_;
2203 2678
… …
2205 2680
2206 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2207 2682
2208 delete $self->{texture}; 2683 delete $self->{texture};
2209 2684
2210 $ROOT->on_refresh ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687
2211 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2689 my $height = 0;
2213 2690
2214 $height += $_->[0] = $self->text_height ($_->[2])
2215 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 }
2216 2703
2217 $self->{height} = $height; 2704 $self->{height} = $height;
2218 2705
2219 $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]);
2220 2707
2221 delete $self->{texture}; 2708 delete $self->{texture};
2222 } 2709 }
2223 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2224 $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 {
2225 glClearColor 0, 0, 0, 0; 2716 glClearColor 0, 0, 0, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2227 2718
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2232 2720
2233 my $y0 = $top; 2721 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2722 my $y1 = $top + $H;
2235 2723
2236 my $y = 0; 2724 my $y = 0;
2237 2725
2238 my $layout = $self->{layout}; 2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2239 2729
2240 $layout->set_font ($self->{font}) if $self->{font};
2241
2242 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2243 my $h = $par->[0]; 2731 my $h = $para->{h};
2244 2732
2245 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
2247 $layout->set_markup ($par->[2]);
2248 2734
2249 my ($W, $H) = $layout->size; 2735 my $layout = $self->get_layout ($para);
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2736
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 }
2251 } 2754 }
2252 2755
2253 $y += $h; 2756 $y += $h;
2254 } 2757 }
2255 2758
2256 glDisable GL_TEXTURE_2D; 2759 glDisable GL_BLEND;
2257 }; 2760 };
2258 }); 2761 });
2259} 2762}
2260 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2261sub _draw { 2773sub _draw {
2262 my ($self) = @_; 2774 my ($self) = @_;
2263 2775
2264 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (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});
2268 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2269 2781
2270 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2271
2272} 2783}
2273 2784
2274############################################################################# 2785#############################################################################
2275 2786
2276package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2321 2832
2322sub new { 2833sub new {
2323 my $class = shift; 2834 my $class = shift;
2324 2835
2325 my $self = $class->SUPER::new ( 2836 my $self = $class->SUPER::new (
2326 state => 0, 2837 state => 0,
2327 connect_activate => \&toggle_flopper, 2838 on_activate => \&toggle_flopper,
2328 @_ 2839 @_
2329 ); 2840 );
2330 2841
2331 if ($self->{state}) {
2332 $self->{state} = 0;
2333 $self->toggle_flopper;
2334 }
2335
2336 $self 2842 $self
2337} 2843}
2338 2844
2339sub toggle_flopper { 2845sub toggle_flopper {
2340 my ($self) = @_; 2846 my ($self) = @_;
2341 2847
2342 # TODO: use animation 2848 $self->{other}->toggle_visibility;
2343 if ($self->{state} = !$self->{state}) {
2344 $CFClient::UI::ROOT->add ($self->{other});
2345 $self->{other}->move ($self->coord2global (0, $self->{h}));
2346 $self->emit ("open");
2347 } else {
2348 $CFClient::UI::ROOT->remove ($self->{other});
2349 $self->emit ("close");
2350 }
2351
2352 $self->emit (changed => $self->{state});
2353} 2849}
2354 2850
2355############################################################################# 2851#############################################################################
2356 2852
2357package CFClient::UI::Tooltip; 2853package CFClient::UI::Tooltip;
… …
2367 @_, 2863 @_,
2368 can_events => 0, 2864 can_events => 0,
2369 ) 2865 )
2370} 2866}
2371 2867
2372sub set_markup { 2868sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2869 my ($self, $widget) = @_;
2374 2870
2871 my $tooltip = $widget->{tooltip};
2872
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
2375 $self->{label} = new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2884 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2886 fontsize => 0.8,
2377 fg => [0, 0, 0], 2887 fg => [0, 0, 0, 1],
2888 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2889 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2890 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2891}
2384 2892
2385sub size_request { 2893sub size_request {
2386 my ($self) = @_; 2894 my ($self) = @_;
2387 2895
2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2389 2897
2390 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2391} 2899}
2392 2900
2393sub size_allocate { 2901sub invoke_size_allocate {
2394 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2395 2903
2396 $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 });
2397} 2923}
2398 2924
2399sub _draw { 2925sub _draw {
2400 my ($self) = @_; 2926 my ($self) = @_;
2401 2927
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2928 glTranslate 0.375, 0.375;
2404 2929
2405 my ($w, $h) = @$self{qw(w h)}; 2930 my ($w, $h) = @$self{qw(w h)};
2406 2931
2407 glColor 1, 0.8, 0.4; 2932 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2943 glVertex 0 , $h;
2419 glVertex $w, $h; 2944 glVertex $w, $h;
2420 glVertex $w, 0; 2945 glVertex $w, 0;
2421 glEnd; 2946 glEnd;
2422 2947
2423 glPopMatrix; 2948 glTranslate 2 - 0.375, 2 - 0.375;
2424 2949
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2950 $self->SUPER::_draw;
2427} 2951}
2428 2952
2429############################################################################# 2953#############################################################################
2430 2954
… …
2435use CFClient::OpenGL; 2959use CFClient::OpenGL;
2436 2960
2437sub new { 2961sub new {
2438 my $class = shift; 2962 my $class = shift;
2439 2963
2440 $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
2441 aspect => 1, 2965 aspect => 1,
2966 can_events => 0,
2442 @_, 2967 @_,
2443 ) 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
2444} 2985}
2445 2986
2446sub size_request { 2987sub size_request {
2447 (32, 8) 2988 (32, 8)
2448} 2989}
2449 2990
2991sub update {
2992 my ($self) = @_;
2993
2994 return unless $self->{visible};
2995
2996 $self->SUPER::update;
2997}
2998
2450sub _draw { 2999sub _draw {
2451 my ($self) = @_; 3000 my ($self) = @_;
2452 3001
2453 return unless $::CONN;#d# manage and cache textures differently 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
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 3014
2456 # TODO animation
2457 if ($tex) { 3015 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2463 } 3021 }
2464} 3022}
2465 3023
3024sub destroy {
3025 my ($self) = @_;
3026
3027 $self->{timer}->cancel
3028 if $self->{timer};
3029
3030 $self->SUPER::destroy;
3031}
3032
2466############################################################################# 3033#############################################################################
2467 3034
2468package CFClient::UI::InventoryItem; 3035package CFClient::UI::Buttonbar;
2469 3036
2470our @ISA = CFClient::UI::HBox::; 3037our @ISA = CFClient::UI::HBox::;
2471 3038
2472sub new { 3039# TODO: should actualyl wrap buttons and other goodies.
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574 3040
2575############################################################################# 3041#############################################################################
2576 3042
2577package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2578 3044
… …
2590 ); 3056 );
2591 3057
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593 3059
2594 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2596 3062
2597 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2598 if (!ref $widget) { 3064 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2600 can_hover => 1, 3066 can_hover => 1,
2601 can_events => 1, 3067 can_events => 1,
2602 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2603 } 3070 }
2604 3071
2605 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2606 3073
2607 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2619 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self; 3087 $GRAB = $self;
2621 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2622 3089
2623 $self->show; 3090 $self->show;
2624 $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);
2625} 3092}
2626 3093
2627sub mouse_motion { 3094sub invoke_mouse_motion {
2628 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2629 3096
2630 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2633}
2634 3100
3101 0
3102}
3103
2635sub button_up { 3104sub invoke_button_up {
2636 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2637 3106
2638 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB; 3108 undef $GRAB;
2640 $self->hide; 3109 $self->hide;
2641 3110
2642 $self->emit ("popdown"); 3111 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2644 } 3117 1
2645} 3118}
2646 3119
2647############################################################################# 3120#############################################################################
2648 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
2649package CFClient::UI::Statusbox; 3288package CFClient::UI::Statusbox;
2650 3289
2651our @ISA = CFClient::UI::VBox::; 3290our @ISA = CFClient::UI::VBox::;
2652 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
2653sub reorder { 3307sub reorder {
2654 my ($self) = @_; 3308 my ($self) = @_;
2655 my $NOW = time; 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} };
2656 3315
2657 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 3318 }
2660 3319
2661 my @widgets; 3320 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 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
2663 my $count = 10 + 1; 3329 my $count = 10 + 1;
2664 for my $item (@items) { 3330 for my $item (@items) {
2665 last unless --$count; 3331 last unless --$count;
2666 3332
2667 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 3335 my $short = $item->{count} > 1
3336 ? "<b>$item->{count} ×</b> $item->{text}"
3337 : $item->{text};
3338
2670 for ($short) { 3339 for ($short) {
2671 s/^\s+//; 3340 s/^\s+//;
2672 s/\012.*//s; 3341 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 3342 }
2676 3343
2677 new CFClient::UI::Label 3344 new CFClient::UI::Label
2678 markup => $short, 3345 markup => $short,
2679 tooltip => delete $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 3347 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 3348 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize},
3350 max_w => $::WIDTH * 0.44,
3351 fg => [@{ $item->{fg} }],
2682 can_events => 1, 3352 can_events => 1,
2683 can_hover => 1, 3353 can_hover => 1
2684 }; 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;
2685 } 3367 }
2686 3368
2687 $self->clear; 3369 $self->clear;
2688 $self->SUPER::add (@widgets); 3370 $self->SUPER::add (reverse @widgets);
2689} 3371}
2690 3372
2691sub add { 3373sub add {
2692 my ($self, $text, %arg) = @_; 3374 my ($self, $text, %arg) = @_;
2693 3375
2694 my $item = { 3376 $text =~ s/^\s+//;
2695 time => time, 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},
2696 text => $text, 3398 text => $text,
2697 timeout => 60, 3399 timeout => $timeout,
2698 tooltip => $text, 3400 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 3401 fg => [0.8, 0.8, 0.8, 0.8],
3402 pri => 0,
3403 count => 1,
2701 %arg, 3404 %arg,
3405 };
2702 }; 3406 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 3407
2709 $self->reorder; 3408 $self->reorder;
2710} 3409}
2711 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
2712############################################################################# 3429#############################################################################
2713 3430
2714package CFClient::UI::Root; 3431package CFClient::UI::Inventory;
2715 3432
2716our @ISA = CFClient::UI::Container::; 3433our @ISA = CFClient::UI::ScrolledWindow::;
2717
2718use CFClient::OpenGL;
2719 3434
2720sub new { 3435sub new {
2721 my $class = shift; 3436 my $class = shift;
2722 3437
2723 $class->SUPER::new ( 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 => [],
2724 @_, 3691 @_,
2725 ) 3692 )
2726} 3693}
2727 3694
2728sub configure { 3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2729 my ($self, $x, $y, $w, $h) = @_;
2730 3696
2731 $self->{w} = $w; 3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2732 $self->{h} = $h; 3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2733} 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");
2734 3707
2735sub check_size { 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 {
2736 my ($self) = @_; 3781 my ($self, $spell) = @_;
2737 3782
2738 $self->size_allocate ($self->{w}, $self->{h}) 3783 $self->{spell}->{$spell->{name}} = $spell;
2739 if $self->{w}; 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
3803package CFClient::UI::Root;
3804
3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
3808
3809use CFClient::OpenGL;
3810
3811sub new {
3812 my $class = shift;
3813
3814 my $self = $class->SUPER::new (
3815 visible => 1,
3816 @_,
3817 );
3818
3819 Scalar::Util::weaken ($self->{root} = $self);
3820
3821 $self
2740} 3822}
2741 3823
2742sub size_request { 3824sub size_request {
2743 my ($self) = @_; 3825 my ($self) = @_;
2744 3826
2745 ($self->{w}, $self->{h}) 3827 ($self->{w}, $self->{h})
2746} 3828}
2747 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
2748sub size_allocate { 3844sub invoke_size_allocate {
2749 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766 3846
2767 for my $child ($self->children) { 3847 for my $child ($self->children) {
2768 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)};
2769 3849
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3850 $X = $child->{force_x} if exists $child->{force_x};
2771 $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
2772 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
2773 } 3857 }
2774 3858
2775 $self->{old_w} = $w; 3859 1
2776 $self->{old_h} = $h;
2777} 3860}
2778 3861
2779sub coord2local { 3862sub coord2local {
2780 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
2781 3864
… …
2789} 3872}
2790 3873
2791sub update { 3874sub update {
2792 my ($self) = @_; 3875 my ($self) = @_;
2793 3876
2794 $self->check_size;
2795 $::WANT_REFRESH++; 3877 $::WANT_REFRESH++;
2796} 3878}
2797 3879
2798sub add { 3880sub add {
2799 my ($self, $child) = @_; 3881 my ($self, @children) = @_;
2800 3882
2801 # integerise window positions 3883 $_->{is_toplevel} = 1
2802 $child->{x} = int $child->{x}; 3884 for @children;
2803 $child->{y} = int $child->{y};
2804 3885
2805 $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 }
2806} 3902}
2807 3903
2808sub on_refresh { 3904sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3905 my ($self, $id, $cb) = @_;
2810 3906
2811 $self->{refresh_hook}{$id} = $cb; 3907 $self->{refresh_hook}{$id} = $cb;
2812} 3908}
2813 3909
3910sub on_post_alloc {
3911 my ($self, $id, $cb) = @_;
3912
3913 $self->{post_alloc_hook}{$id} = $cb;
3914}
3915
2814sub draw { 3916sub draw {
2815 my ($self) = @_; 3917 my ($self) = @_;
2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860 3918
2861 while ($self->{refresh_hook}) { 3919 while ($self->{refresh_hook}) {
2862 $_->() 3920 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
2864 } 3922 }
2865 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
4015
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4016 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 4018 glClear GL_COLOR_BUFFER_BIT;
2869 4019
2870 glMatrixMode GL_PROJECTION; 4020 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 4021 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 4024 glLoadIdentity;
2875 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
2876 $self->_draw; 4033 $self->_draw;
2877} 4034}
2878 4035
2879############################################################################# 4036#############################################################################
2880 4037
2881package CFClient::UI; 4038package CFClient::UI;
2882 4039
2883$ROOT = new CFClient::UI::Root; 4040$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 4041$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 4042
28861 40431
2887 4044

Diff Legend

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