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

Diff Legend

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