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.311 by root, Fri Jun 23 22:35:16 2006 UTC

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

Diff Legend

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