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

Diff Legend

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