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

Diff Legend

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