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.206 by root, Mon May 15 17:45:29 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 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 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
82}
83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
62} 95}
63 96
64sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
65 my ($ev) = @_; 98 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
67 100
68 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
69 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
70 103
71 $GRAB = $widget; 104 $GRAB = $widget;
72 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
73 106
74 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
75 } 108 }
76 109
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 111
79 if ($GRAB) { 112 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y); 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
82 } 121 }
83} 122}
84 123
85sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
86 my ($ev) = @_; 125 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y});
88 126
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
90 128
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 130
93 if ($GRAB) { 131 $GRAB->emit (button_up => $ev)
94 ($x, $y) = $GRAB->coord2local ($x, $y); 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 133
98 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 136 $grab->update if $grab;
101 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
102 138
103 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
104 } 141 }
105} 142}
106 143
107sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
108 my ($ev) = @_; 145 my ($ev) = @_;
109 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
110 147
111 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
112 149
113 if ($widget != $HOVER) { 150 check_hover $widget;
114 my $hover = $HOVER; $HOVER = $widget;
115 151
116 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
117 $HOVER->update if $HOVER && $HOVER->{can_hover};
118
119 check_tooltip;
120 }
121
122 if ($HOVER) { 153 if $HOVER;
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
126} 154}
127 155
128# convert position array to integers 156# convert position array to integers
129sub harmonize { 157sub harmonize {
130 my ($vals) = @_; 158 my ($vals) = @_;
… …
136 $rem += $_ - $i; 164 $rem += $_ - $i;
137 $_ = $i; 165 $_ = $i;
138 } 166 }
139} 167}
140 168
169sub full_refresh {
170 # make a copy, otherwise for complains about freed values.
171 my @widgets = values %WIDGET;
172
173 $_->update
174 for @widgets;
175}
176
177sub reconfigure_widgets {
178 # make a copy, otherwise C<for> complains about freed values.
179 my @widgets = values %WIDGET;
180
181 $_->reconfigure
182 for @widgets;
183}
184
141# call when resolution changes etc. 185# call when resolution changes etc.
142sub rescale_widgets { 186sub rescale_widgets {
143 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
144 188
145 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 190 if ($widget->{is_toplevel}) {
191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
193
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 194 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 196 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 197 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 200
201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
203
155 } 204 }
156
157 $widget->reconfigure;
158 } 205 }
206
207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
159} 216}
160 217
161############################################################################# 218#############################################################################
162 219
163package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
168 225
169sub new { 226sub new {
170 my $class = shift; 227 my $class = shift;
171 228
172 my $self = bless { 229 my $self = bless {
173 x => 0, 230 x => "center",
174 y => 0, 231 y => "center",
175 z => 0, 232 z => 0,
233 w => undef,
234 h => undef,
176 can_events => 1, 235 can_events => 1,
177 @_ 236 @_
178 }, $class; 237 }, $class;
179 238
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
240
180 for (keys %$self) { 241 for (keys %$self) {
181 if (/^connect_(.*)$/) { 242 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
183 } 244 }
184 } 245 }
185 246
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
252
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255
256 $self->show if $layout->{show};
257 }
187 258
188 $self 259 $self
189} 260}
190 261
191sub destroy { 262sub destroy {
… …
201 return if $self->{parent}; 272 return if $self->{parent};
202 273
203 $CFClient::UI::ROOT->add ($self); 274 $CFClient::UI::ROOT->add ($self);
204} 275}
205 276
206sub hide { 277sub set_visible {
207 my ($self) = @_; 278 my ($self) = @_;
279
280 return if $self->{visible};
281
282 $self->{root} = $self->{parent}{root};
283 $self->{visible} = $self->{parent}{visible} + 1;
284
285 $self->emit (visibility_change => 1);
286
287 $self->realloc if !exists $self->{req_w};
288
289 $_->set_visible for $self->children;
290}
291
292sub set_invisible {
293 my ($self) = @_;
294
295 return unless $self->{visible};
296
297 $_->set_invisible for $self->children;
298
299 delete $self->{visible};
300 delete $self->{root};
208 301
209 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
211 304
305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self;
307
308 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0);
310}
311
312sub set_visibility {
313 my ($self, $visible) = @_;
314
315 return if $self->{visible} == $visible;
316
317 $visible ? $self->hide
318 : $self->show;
319}
320
321sub toggle_visibility {
322 my ($self) = @_;
323
324 $self->{visible}
325 ? $self->hide
326 : $self->show;
327}
328
329sub hide {
330 my ($self) = @_;
331
332 $self->set_invisible;
333
212 $self->{parent}->remove ($self) 334 $self->{parent}->remove ($self)
213 if $self->{parent}; 335 if $self->{parent};
214} 336}
215 337
216sub move { 338sub move_abs {
217 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
218 340
219 $self->{x} = int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
220 $self->{y} = int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
221 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
222 344
223 $self->update; 345 $self->update;
224} 346}
225 347
226sub set_size { 348sub set_size {
227 my ($self, $w, $h) = @_; 349 my ($self, $w, $h) = @_;
228 350
229 $self->{user_w} = $w; 351 $self->{force_w} = $w;
230 $self->{user_h} = $h; 352 $self->{force_h} = $h;
231 353
232 $self->check_size; 354 $self->realloc;
233} 355}
234 356
235sub size_request { 357sub size_request {
236 require Carp; 358 require Carp;
237 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
238} 360}
239 361
362sub baseline_shift {
363 0
364}
365
240sub configure { 366sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
242 368
243 if ($self->{aspect}) { 369 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h);
371
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, int $w / $self->{aspect};
246 374
247 # use alignment to adjust x, y 375 # use alignment to adjust x, y
248 376
249 $x += int +($w - $w2) * 0.5; 377 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 378 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 379 }
254 380
255 if ($self->{x} != $x || $self->{y} != $y) { 381 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 382 $self->{x} = $x;
257 $self->{y} = $y; 383 $self->{y} = $y;
258 $self->update; 384 $self->update;
259 } 385 }
260 386
261 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 388 return unless $self->{visible};
263 }
264}
265 389
266sub size_allocate { 390 $self->{alloc_w} = $w;
267 # nothing to be done 391 $self->{alloc_h} = $h;
268}
269 392
270sub reconfigure { 393 $self->{root}{size_alloc}{$self+0} = $self;
271 my ($self) = @_; 394 }
272
273 $self->check_size (1);
274 $self->update;
275} 395}
276 396
277sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
278} 403}
279 404
280sub set_max_size { 405sub set_max_size {
281 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
282 407
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
412}
413
414sub set_tooltip {
415 my ($self, $tooltip) = @_;
416
417 $tooltip =~ s/^\s+//;
418 $tooltip =~ s/\s+$//;
419
420 return if $self->{tooltip} eq $tooltip;
421
422 $self->{tooltip} = $tooltip;
423
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
427 }
285} 428}
286 429
287# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
288sub coord2local { 431sub coord2local {
289 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
… …
296 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
297 440
298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
299} 442}
300 443
301sub focus_in { 444sub invoke_focus_in {
302 my ($self) = @_; 445 my ($self) = @_;
303 446
304 return if $FOCUS == $self; 447 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
306 449
307 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
308 451
309 $self->emit (focus_in => $focus); 452 $self->update;
310 453
311 $focus->update if $focus; 454 0
312 $FOCUS->update;
313} 455}
314 456
315sub focus_out { 457sub invoke_focus_out {
316 my ($self) = @_; 458 my ($self) = @_;
317 459
318 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
319 461
320 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
321 463
322 $self->emit (focus_out => $focus); 464 $self->update;
323 465
324 $focus->update if $focus; #? 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
325} 467 unless $FOCUS;
326 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
327sub mouse_motion { } 479sub invoke_mouse_motion { 0 }
328sub button_up { } 480sub invoke_button_up { 0 }
329sub key_down { } 481sub invoke_key_down { 0 }
330sub key_up { } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
331 484
332sub button_down { 485sub invoke_button_down {
333 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
334 487
335 $self->focus_in; 488 $self->grab_focus;
336}
337 489
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 490 0
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 491}
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 492
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 493sub connect {
342sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
513}
514
515sub find_widget {
516 my ($self, $x, $y) = @_;
517
518 return () unless $self->{can_events};
519
520 return $self
521 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
522 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
523
524 ()
525}
526
527sub set_parent {
528 my ($self, $parent) = @_;
529
530 Scalar::Util::weaken ($self->{parent} = $parent);
531 $self->set_visible if $parent->{visible};
532}
533
534sub realloc {
535 my ($self) = @_;
536
537 if ($self->{visible}) {
538 return if $self->{root}{realloc}{$self+0};
539
540 $self->{root}{realloc}{$self+0} = $self;
541 $self->{root}->update;
542 } else {
543 delete $self->{req_w};
544 delete $self->{req_h};
545 }
546}
547
548sub update {
549 my ($self) = @_;
550
551 $self->{parent}->update
552 if $self->{parent};
553}
554
555sub reconfigure {
556 my ($self) = @_;
557
558 $self->realloc;
559 $self->update;
560}
561
562# using global variables seems a bit hacky, but passing through all drawing
563# functions seems pointless.
564our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
343 565
344sub draw { 566sub draw {
345 my ($self) = @_; 567 my ($self) = @_;
346 568
347 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
570
571 # update screen rectangle
572 local $draw_x = $draw_x + $self->{x};
573 local $draw_y = $draw_y + $self->{y};
574
575 # skip widgets that are entirely outside the drawing area
576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
348 578
349 glPushMatrix; 579 glPushMatrix;
350 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
351 $self->_draw;
352 glPopMatrix;
353 581
354 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
355 my ($x, $y) = @$self{qw(x y)};
356
357 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
358 glEnable GL_BLEND; 584 glEnable GL_BLEND;
359 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
360 glBegin GL_QUADS; 586 glBegin GL_QUADS;
361 glVertex $x , $y;
362 glVertex $x + $self->{w}, $y;
363 glVertex $x + $self->{w}, $y + $self->{h};
364 glVertex $x , $y + $self->{h};
365 glEnd;
366 glDisable GL_BLEND;
367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 587 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 588 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h}; 589 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h}; 590 glVertex 0 , $self->{h};
378 glEnd; 591 glEnd;
592 glDisable GL_BLEND;
593 }
594
595 if ($ENV{CFPLUS_DEBUG} & 1) {
596 glPushMatrix;
597 glColor 1, 1, 0, 1;
598 glTranslate 0.375, 0.375;
599 glBegin GL_LINE_LOOP;
600 glVertex 0 , 0;
601 glVertex $self->{w} - 1, 0;
602 glVertex $self->{w} - 1, $self->{h} - 1;
603 glVertex 0 , $self->{h} - 1;
604 glEnd;
379 glPopMatrix; 605 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
382} 611}
383 612
384sub _draw { 613sub _draw {
385 my ($self) = @_; 614 my ($self) = @_;
386 615
387 warn "no draw defined for $self\n"; 616 warn "no draw defined for $self\n";
388} 617}
389 618
390sub find_widget {
391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401
402sub set_parent {
403 my ($self, $parent) = @_;
404
405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
417}
418
419sub update {
420 my ($self) = @_;
421
422 $self->{parent}->update
423 if $self->{parent};
424}
425
426sub connect {
427 my ($self, $signal, $cb) = @_;
428
429 push @{ $self->{signal_cb}{$signal} }, $cb;
430}
431
432sub emit {
433 my ($self, $signal, @args) = @_;
434
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436}
437
438sub DESTROY { 619sub DESTROY {
439 my ($self) = @_; 620 my ($self) = @_;
440 621
622 return if CFClient::in_destruct;
623
441 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
442 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
443} 628}
444 629
445############################################################################# 630#############################################################################
446 631
447package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
455 my $class = shift; 640 my $class = shift;
456 641
457 # range [value, low, high, page] 642 # range [value, low, high, page]
458 643
459 $class->SUPER::new ( 644 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 645 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 646 #active_bg => [1, 1, 1, 0.5],
462 @_ 647 @_
463 ) 648 )
464} 649}
465 650
466sub _draw { 651sub _draw {
467 my ($self) = @_; 652 my ($self) = @_;
468 653
654 my $color = $FOCUS == $self && $self->{active_bg}
655 ? $self->{active_bg}
656 : $self->{bg};
657
658 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
470 660
471 glEnable GL_BLEND; 661 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 663 glColor_premultiply @$color;
474 664
475 glBegin GL_QUADS; 665 glBegin GL_QUADS;
476 glVertex 0 , 0; 666 glVertex 0 , 0;
477 glVertex 0 , $h; 667 glVertex 0 , $h;
478 glVertex $w, $h; 668 glVertex $w, $h;
479 glVertex $w, 0; 669 glVertex $w, 0;
480 glEnd; 670 glEnd;
481 671
482 glDisable GL_BLEND; 672 glDisable GL_BLEND;
673 }
483} 674}
484 675
485############################################################################# 676#############################################################################
486 677
487package CFClient::UI::Empty; 678package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 683 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 684 $class->SUPER::new (can_events => 0, %arg);
494} 685}
495 686
496sub size_request { 687sub size_request {
497 (0, 0) 688 my ($self) = @_;
689
690 ($self->{w} + 0, $self->{h} + 0)
498} 691}
499 692
500sub draw { } 693sub draw { }
501 694
502############################################################################# 695#############################################################################
… …
506our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
507 700
508sub new { 701sub new {
509 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
510 703
511 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
512 705
513 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
514 children => [], 707 children => [],
515 can_events => 0, 708 can_events => 0,
516 %arg, 709 %arg,
517 ); 710 );
711
518 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
519 714
520 $self 715 $self
521} 716}
522 717
523sub add { 718sub add {
… …
531 $self->{children} = [ 726 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 727 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 728 @{$self->{children}}, @widgets
534 ]; 729 ];
535 730
536 $self->check_size (1); 731 $self->realloc;
537 $self->update;
538} 732}
539 733
540sub children { 734sub children {
541 @{ $_[0]{children} } 735 @{ $_[0]{children} }
542} 736}
… …
547 delete $child->{parent}; 741 delete $child->{parent};
548 $child->hide; 742 $child->hide;
549 743
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 744 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 745
552 $self->check_size; 746 $self->realloc;
553 $self->update;
554} 747}
555 748
556sub clear { 749sub clear {
557 my ($self) = @_; 750 my ($self) = @_;
558 751
… …
562 for (@$children) { 755 for (@$children) {
563 delete $_->{parent}; 756 delete $_->{parent};
564 $_->hide; 757 $_->hide;
565 } 758 }
566 759
567 $self->check_size; 760 $self->realloc;
568 $self->update;
569} 761}
570 762
571sub find_widget { 763sub find_widget {
572 my ($self, $x, $y) = @_; 764 my ($self, $x, $y) = @_;
573 765
574 $x -= $self->{x}; 766 $x -= $self->{x};
575 $y -= $self->{y}; 767 $y -= $self->{y};
576 768
577 my $res; 769 my $res;
578 770
579 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
580 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
581 and return $res; 773 and return $res;
582 } 774 }
583 775
584 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
605} 797}
606 798
607sub add { 799sub add {
608 my ($self, $child) = @_; 800 my ($self, $child) = @_;
609 801
610 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
611
612 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
613} 804}
614 805
615sub remove { 806sub remove {
616 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
625 816
626sub size_request { 817sub size_request {
627 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
628} 819}
629 820
630sub size_allocate { 821sub invoke_size_allocate {
631 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
632 823
633 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
634} 827}
635 828
636############################################################################# 829#############################################################################
830
831# back-buffered drawing area
637 832
638package CFClient::UI::Window; 833package CFClient::UI::Window;
639 834
640our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
641 836
… …
652 847
653 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
654 $self->SUPER::update; 849 $self->SUPER::update;
655} 850}
656 851
657sub size_allocate { 852sub invoke_size_allocate {
658 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
659 854
660 $self->SUPER::size_allocate ($w, $h);
661 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
662} 858}
663 859
664sub _render { 860sub _render {
861 my ($self) = @_;
862
665 $_[0]{children}[0]->draw; 863 $self->{children}[0]->draw;
666} 864}
667 865
668sub render_child { 866sub render_child {
669 my ($self) = @_; 867 my ($self) = @_;
670 868
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 869 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 870 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 871 glClear GL_COLOR_BUFFER_BIT;
674 872
873 {
874 package CFClient::UI::Base;
875
876 ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h});
878 }
879
675 $self->_render; 880 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 881 };
684} 882}
685 883
686sub _draw { 884sub _draw {
687 my ($self) = @_; 885 my ($self) = @_;
688 886
689 my ($w, $h) = ($self->w, $self->h); 887 my ($w, $h) = @$self{qw(w h)};
690 888
691 my $tex = $self->{texture} 889 my $tex = $self->{texture}
692 or return; 890 or return;
693 891
694 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
… …
704 902
705package CFClient::UI::ViewPort; 903package CFClient::UI::ViewPort;
706 904
707our @ISA = CFClient::UI::Window::; 905our @ISA = CFClient::UI::Window::;
708 906
907sub new {
908 my $class = shift;
909
910 $class->SUPER::new (
911 scroll_x => 0,
912 scroll_y => 1,
913 @_,
914 )
915}
916
709sub size_request { 917sub size_request {
710 my ($self) = @_; 918 my ($self) = @_;
711 919
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 920 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 921
715 @$self{qw(child_w child_h)} 922 $w = 10 if $self->{scroll_x};
716} 923 $h = 10 if $self->{scroll_y};
717 924
925 ($w, $h)
926}
927
718sub size_allocate { 928sub invoke_size_allocate {
719 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
720 930
931 my $child = $self->child;
932
933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
935
936 $self->child->configure (0, 0, $w, $h);
721 $self->update; 937 $self->update;
938
939 1
722} 940}
723 941
724sub set_offset { 942sub set_offset {
725 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
726 944
… …
759} 977}
760 978
761sub _render { 979sub _render {
762 my ($self) = @_; 980 my ($self) = @_;
763 981
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
984
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765 986
766 $self->SUPER::_render; 987 $self->SUPER::_render;
767} 988}
768 989
… …
771package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
772 993
773our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
774 995
775sub new { 996sub new {
776 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
777 1000
778 my $self; 1001 my $self;
779 1002
780 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
781 vertical => 1, 1004 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 1005 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 1006 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1007 $self->{vp}->set_offset (0, $_[1]);
785 }, 1008 },
786 ; 1009 ;
787 1010
788 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
790 slider => $slider, 1014 slider => $slider,
791 @_, 1015 %arg,
792 ); 1016 );
793 1017
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
797 1020
798 $self 1021 $self
799} 1022}
800 1023
801#TODO# update range on size_allocate depending on child 1024#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 1025
1026sub add {
1027 my ($self, $widget) = @_;
1028
1029 $self->{vp}->add ($self->{child} = $widget);
1030}
1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
1048sub update {
1049 my ($self) = @_;
1050
1051 $self->SUPER::update;
1052
1053 $self->update_slider;
1054}
1055
1056sub invoke_size_allocate {
1057 my ($self, $w, $h) = @_;
1058
1059 $self->update_slider;
1060
1061 $self->SUPER::invoke_size_allocate ($w, $h)
1062}
803 1063
804############################################################################# 1064#############################################################################
805 1065
806package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
807 1067
… …
823 1083
824 if ($self->{bg}) { 1084 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
826 1086
827 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
829 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
830 1090
831 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
832 glVertex 0 , 0; 1092 glVertex 0 , 0;
833 glVertex 0 , $h; 1093 glVertex 0 , $h;
834 glVertex $w, $h; 1094 glVertex $w, $h;
… …
847 1107
848our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFClient::UI::Bin::;
849 1109
850use CFClient::OpenGL; 1110use CFClient::OpenGL;
851 1111
852my @tex = 1112my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1;
1115
1116my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855 1119
856sub new { 1120sub new {
857 my $class = shift; 1121 my ($class, %arg) = @_;
858
859 # TODO: user_x, user_y, overwrite moveto?
860 1122
861 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1126 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1127 can_events => 1,
867 @_ 1128 min_w => 64,
1129 min_h => 32,
1130 %arg,
868 ); 1131 );
869 1132
870 $self->{title} &&= new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
871 align => 0, 1134 align => 0,
872 valign => 1, 1135 valign => 1,
873 text => $self->{title}, 1136 text => $self->{title},
874 fontsize => $self->{border}; 1137 fontsize => $self->{border},
1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
875 1148
876 $self 1149 $self
1150}
1151
1152sub add {
1153 my ($self, @widgets) = @_;
1154
1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
877} 1158}
878 1159
879sub border { 1160sub border {
880 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
881} 1162}
882 1163
883sub size_request { 1164sub size_request {
884 my ($self) = @_; 1165 my ($self) = @_;
1166
1167 $self->{title_widget}->size_request
1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
885 1172
886 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
887 1174
888 ( 1175 (
889 $w + $self->border * 2, 1176 $w + $self->border * 2,
890 $h + $self->border * 2, 1177 $h + $self->border * 2,
891 ) 1178 )
892} 1179}
893 1180
894sub size_allocate { 1181sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
896 1183
1184 if ($self->{title_widget}) {
1185 $self->{title_widget}{w} = $w;
1186 $self->{title_widget}{h} = $h;
1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1188 }
1189
1190 my $border = $self->border;
1191
897 $h -= List::Util::max 0, $self->border * 2; 1192 $h -= List::Util::max 0, $border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 1193 $w -= List::Util::max 0, $border * 2;
899 1194
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
901 if $self->{title};
902
903 $self->child->configure ($self->border, $self->border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
904}
905 1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1208 1
1209}
1210
906sub button_down { 1211sub invoke_button_down {
907 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
908 1213
909 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
910 my $border = $self->border; 1215 my $border = $self->border;
911 1216
… …
924 my ($ev, $x, $y) = @_; 1229 my ($ev, $x, $y) = @_;
925 1230
926 my $dx = $ev->{x} - $ox; 1231 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
928 1233
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1236
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size; 1238 $self->realloc;
933 }; 1239 };
934 1240
935 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1245 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
941 1247
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
943 1249
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update; 1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
946 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
947 } 1258 1
948} 1259}
949 1260
950sub button_up { 1261sub invoke_button_up {
951 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
952 1263
953 delete $self->{motion}; 1264 ! ! delete $self->{motion}
954} 1265}
955 1266
956sub mouse_motion { 1267sub invoke_mouse_motion {
957 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
958 1269
959 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
960} 1273}
961 1274
962sub _draw { 1275sub _draw {
963 my ($self) = @_; 1276 my ($self) = @_;
964 1277
1278 my $child = $self->{children}[0];
1279
965 my ($w, $h ) = ($self->{w}, $self->{h}); 1280 my ($w, $h ) = ($self->{w}, $self->{h});
966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1281 my ($cw, $ch) = ($child->{w}, $child->{h});
967 1282
968 glEnable GL_TEXTURE_2D; 1283 glEnable GL_TEXTURE_2D;
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1285
971 my $border = $self->border; 1286 my $border = $self->border;
972 1287
973 glColor @{ $self->{border_bg} }; 1288 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1289 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1293
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1295 glColor @{ $self->{bg} };
981 1296
982 # TODO: repeat texture not scale 1297 # TODO: repeat texture not scale
1298 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1299 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1300 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1301 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1302 }
993 1303
994 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
995 1305
996 $self->{title}->draw if $self->{title};
997
998 $self->child->draw; 1306 $child->draw;
1307
1308 if ($self->{title_widget}) {
1309 glTranslate 0, $border - $self->{h};
1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
999} 1317}
1000 1318
1001############################################################################# 1319#############################################################################
1002 1320
1003package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1011sub new { 1329sub new {
1012 my $class = shift; 1330 my $class = shift;
1013 1331
1014 $class->SUPER::new ( 1332 $class->SUPER::new (
1015 col_expand => [], 1333 col_expand => [],
1016 @_ 1334 @_,
1017 ) 1335 )
1336}
1337
1338sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1340}
1019 1341
1020sub add { 1342sub add {
1021 my ($self, $x, $y, $child) = @_; 1343 my ($self, $x, $y, $child) = @_;
1022 1344
1023 $child->set_parent ($self); 1345 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1025 1347
1026 $child->check_size; 1348 $self->realloc;
1027} 1349}
1028 1350
1029sub children { 1351sub remove {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1352 my ($self, $child) = @_;
1031}
1032 1353
1354 # TODO: not yet implemented
1355}
1356
1033# TODO: move to container class maybe? send childs a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1358sub clear {
1035 my ($self) = @_; 1359 my ($self) = @_;
1036 1360
1037 my @children = $self->children; 1361 my @children = $self->children;
1038 delete $self->{children}; 1362 delete $self->{children};
… …
1040 for (@children) { 1364 for (@children) {
1041 delete $_->{parent}; 1365 delete $_->{parent};
1042 $_->hide; 1366 $_->hide;
1043 } 1367 }
1044 1368
1045 $self->update; 1369 $self->realloc;
1046} 1370}
1047 1371
1048sub get_wh { 1372sub get_wh {
1049 my ($self) = @_; 1373 my ($self) = @_;
1050 1374
… …
1076 (sum @$ws), 1400 (sum @$ws),
1077 (sum @$hs), 1401 (sum @$hs),
1078 ) 1402 )
1079} 1403}
1080 1404
1081sub size_allocate { 1405sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1083 1407
1084 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1085 1409
1086 my $req_w = sum @$ws; 1410 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1411 my $req_h = (sum @$hs) || 1;
1088 1412
1089 # TODO: nicer code && do row_expand 1413 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1414 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1415 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1416 my $col_expand = (sum @col_expand) || 1;
… …
1118 } 1442 }
1119 1443
1120 $y += $row_h; 1444 $y += $row_h;
1121 } 1445 }
1122 1446
1447 1
1123} 1448}
1124 1449
1125sub find_widget { 1450sub find_widget {
1126 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1127 1452
… …
1146 } 1471 }
1147} 1472}
1148 1473
1149############################################################################# 1474#############################################################################
1150 1475
1476package CFClient::UI::Box;
1477
1478our @ISA = CFClient::UI::Container::;
1479
1480sub size_request {
1481 my ($self) = @_;
1482
1483 $self->{vertical}
1484 ? (
1485 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1486 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1487 )
1488 : (
1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1491 )
1492}
1493
1494sub invoke_size_allocate {
1495 my ($self, $w, $h) = @_;
1496
1497 my $space = $self->{vertical} ? $h : $w;
1498 my @children = $self->visible_children;
1499
1500 my @req;
1501
1502 if ($self->{homogeneous}) {
1503 @req = ($space / (@children || 1)) x @children;
1504 } else {
1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1506 my $req = List::Util::sum @req;
1507
1508 if ($req > $space) {
1509 # ah well, not enough space
1510 $_ *= $space / $req for @req;
1511 } else {
1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1513
1514 $space = ($space - $req) / $expand; # remaining space to give away
1515
1516 $req[$_] += $space * $children[$_]{expand}
1517 for 0 .. $#children;
1518 }
1519 }
1520
1521 CFClient::UI::harmonize \@req;
1522
1523 my $pos = 0;
1524 for (0 .. $#children) {
1525 my $alloc = $req[$_];
1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1527
1528 $pos += $alloc;
1529 }
1530
1531 1
1532}
1533
1534#############################################################################
1535
1151package CFClient::UI::HBox; 1536package CFClient::UI::HBox;
1152 1537
1153# TODO: wrap into common Box base class
1154
1155our @ISA = CFClient::UI::Container::; 1538our @ISA = CFClient::UI::Box::;
1156 1539
1157sub size_request { 1540sub new {
1158 my ($self) = @_; 1541 my $class = shift;
1159 1542
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1543 $class->SUPER::new (
1161 1544 vertical => 0,
1162 ( 1545 @_,
1163 (List::Util::sum map $_->[0], @alloc),
1164 (List::Util::max map $_->[1], @alloc),
1165 ) 1546 )
1166} 1547}
1167 1548
1168sub size_allocate {
1169 my ($self, $w, $h) = @_;
1170
1171 ($h, $w) = ($w, $h);
1172
1173 my $children = $self->{children};
1174
1175 my @h = map $_->{req_w}, @$children;
1176
1177 my $req_h = List::Util::sum @h;
1178
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } else {
1183 my $exp = List::Util::sum map $_->{expand}, @$children;
1184 $exp ||= 1;
1185
1186 for (0 .. $#$children) {
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 }
1193 }
1194
1195 CFClient::UI::harmonize \@h;
1196
1197 my $y = 0;
1198 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_];
1201 $child->configure ($y, 0, $h, $w);
1202
1203 $y += $h;
1204 }
1205
1206 1
1207}
1208
1209############################################################################# 1549#############################################################################
1210 1550
1211package CFClient::UI::VBox; 1551package CFClient::UI::VBox;
1212 1552
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1553our @ISA = CFClient::UI::Box::;
1216 1554
1217sub size_request { 1555sub new {
1218 my ($self) = @_; 1556 my $class = shift;
1219 1557
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1558 $class->SUPER::new (
1221 1559 vertical => 1,
1222 ( 1560 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1561 )
1226} 1562}
1227 1563
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1564#############################################################################
1268 1565
1269package CFClient::UI::Label; 1566package CFClient::UI::Label;
1270 1567
1271our @ISA = CFClient::UI::Base::; 1568our @ISA = CFClient::UI::DrawBG::;
1272 1569
1273use CFClient::OpenGL; 1570use CFClient::OpenGL;
1274 1571
1275sub new { 1572sub new {
1276 my ($class, %arg) = @_; 1573 my ($class, %arg) = @_;
1277 1574
1278 my $self = $class->SUPER::new ( 1575 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1576 fg => [1, 1, 1],
1577 #bg => none
1578 #active_bg => none
1280 #font => default_font 1579 #font => default_font
1281 #text => initial text 1580 #text => initial text
1282 #markup => initial narkup 1581 #markup => initial narkup
1582 #max_w => maximum pixel width
1583 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1584 layout => (new CFClient::Layout),
1284 fontsize => 1, 1585 fontsize => 1,
1285 align => -1, 1586 align => -1,
1286 valign => -1, 1587 valign => -1,
1287 padding => 2, 1588 padding_x => 2,
1589 padding_y => 2,
1288 can_events => 0, 1590 can_events => 0,
1289 %arg 1591 %arg
1290 ); 1592 );
1291 1593
1292 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
… …
1302 } 1604 }
1303 1605
1304 $self 1606 $self
1305} 1607}
1306 1608
1307sub escape { 1609sub escape($) {
1308 local $_ = $_[1]; 1610 local $_ = $_[0];
1309 1611
1310 s/&/&amp;/g; 1612 s/&/&amp;/g;
1311 s/>/&gt;/g; 1613 s/>/&gt;/g;
1312 s/</&lt;/g; 1614 s/</&lt;/g;
1313 1615
1314 $_[1] 1616 $_
1315} 1617}
1316 1618
1317sub update { 1619sub update {
1318 my ($self) = @_; 1620 my ($self) = @_;
1319 1621
1320 delete $self->{texture}; 1622 delete $self->{texture};
1321 $self->SUPER::update; 1623 $self->SUPER::update;
1322} 1624}
1323 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1324sub set_text { 1633sub set_text {
1325 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1326 1635
1327 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1329 1638
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1332 1640
1641 delete $self->{size_req};
1642 $self->realloc;
1333 $self->update; 1643 $self->update;
1334 $self->check_size;
1335} 1644}
1336 1645
1337sub set_markup { 1646sub set_markup {
1338 my ($self, $markup) = @_; 1647 my ($self, $markup) = @_;
1339 1648
1340 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1342 1651
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1653
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1347 1655
1656 delete $self->{size_req};
1657 $self->realloc;
1348 $self->update; 1658 $self->update;
1349 $self->check_size;
1350} 1659}
1351 1660
1352sub size_request { 1661sub size_request {
1353 my ($self) = @_; 1662 my ($self) = @_;
1354 1663
1664 $self->{size_req} ||= do {
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1670
1359 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1360 1672
1361 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1677
1365 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1366 1679
1367 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1369 } 1685 };
1370 1686
1371 ( 1687 @{ $self->{size_req} }
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1688}
1376 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1377sub size_allocate { 1694sub invoke_size_allocate {
1378 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1379 1696
1697 delete $self->{ox};
1698
1380 delete $self->{texture}; 1699 delete $self->{texture}
1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1381} 1703}
1382 1704
1383sub set_fontsize { 1705sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1385 1707
1386 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1387 delete $self->{texture}; 1710 delete $self->{texture};
1388 1711
1389 $self->update; 1712 $self->realloc;
1390 $self->check_size; 1713}
1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1391} 1722}
1392 1723
1393sub _draw { 1724sub _draw {
1394 my ($self) = @_; 1725 my ($self) = @_;
1395 1726
1727 $self->SUPER::_draw; # draw background, if applicable
1728
1396 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1736
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1737 [$self->{layout}->size]
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1413 }; 1738 };
1414 1739
1415 glEnable GL_TEXTURE_2D; 1740 unless (exists $self->{ox}) {
1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1743 : ($self->{w} - $size->[0]) * 0.5);
1417 1744
1418 if ($tex->{format} == GL_ALPHA) { 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1419 glColor @{$self->{fg}}; 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1747 : ($self->{h} - $size->[1]) * 0.5);
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 } 1748 };
1424 1749
1425 glDisable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1752
1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1426} 1754}
1427 1755
1428############################################################################# 1756#############################################################################
1429 1757
1430package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1443 active_fg => [0, 0, 0], 1771 active_fg => [0, 0, 0],
1444 can_hover => 1, 1772 can_hover => 1,
1445 can_focus => 1, 1773 can_focus => 1,
1446 valign => 0, 1774 valign => 0,
1447 can_events => 1, 1775 can_events => 1,
1776 #text => ...
1777 #hidden => "*",
1448 @_ 1778 @_
1449 ) 1779 )
1450} 1780}
1451 1781
1452sub _set_text { 1782sub _set_text {
… …
1454 1784
1455 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1456 1786
1457 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1458 1788
1459 delete $self->{texture};
1460
1461 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1462 $self->{text} = $text; 1790 $self->{text} = $text;
1463 1791
1464 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1466 1795
1467 $self->emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1468} 1800}
1469 1801
1470sub set_text { 1802sub set_text {
1471 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1472 1804
1473 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1806 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477} 1807}
1478 1808
1479sub get_text { 1809sub get_text {
1480 $_[0]{text} 1810 $_[0]{text}
1481} 1811}
… …
1486 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1487 1817
1488 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1489} 1819}
1490 1820
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495}
1496
1497sub key_down { 1821sub invoke_key_down {
1498 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1499 1823
1500 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1501 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1502 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1517 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1843 $self->emit ('escape');
1520 } elsif ($uni) { 1844 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1522 } 1848 }
1523 1849
1524 $self->_set_text ($text); 1850 $self->_set_text ($text);
1525 $self->update;
1526}
1527 1851
1852 $self->realloc;
1853
1854 1
1855}
1856
1528sub focus_in { 1857sub invoke_focus_in {
1529 my ($self) = @_; 1858 my ($self) = @_;
1530 1859
1531 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1532 1861
1533 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1534} 1863}
1535 1864
1536sub button_down { 1865sub invoke_button_down {
1537 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1538 1867
1539 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1540 1869
1541 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1542 1871
1543 # byte-index to char-index 1872 # byte-index to char-index
1544 my $text = $self->{text}; 1873 my $text = $self->{text};
1545 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1546 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1547 1876
1548 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1549 $self->update; 1878 $self->update;
1879
1880 1
1550} 1881}
1551 1882
1552sub mouse_motion { 1883sub invoke_mouse_motion {
1553 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1554# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1886
1887 1
1555} 1888}
1556 1889
1557sub _draw { 1890sub _draw {
1558 my ($self) = @_; 1891 my ($self) = @_;
1559 1892
1560 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1561 1894
1562 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1563 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1564 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1565 } else { 1898 } else {
1566 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1567 } 1900 }
1568 1901
1569 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1570 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1571 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1572 glVertex 0 , 0; 1905 glVertex 0 , 0;
1573 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1574 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1575 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1600 1933
1601our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1602 1935
1603use CFClient::OpenGL; 1936use CFClient::OpenGL;
1604 1937
1605sub key_down { 1938sub invoke_key_down {
1606 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1607 1940
1608 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1609 1942
1610 if ($sym == 13) { 1943 if ($sym == 13) {
1611 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1613 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 1949 $self->emit (activate => $txt);
1616 $self->update; 1950 $self->update;
1617 1951
… …
1636 } else { 1970 } else {
1637 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1638 } 1972 }
1639 1973
1640 } else { 1974 } else {
1641 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1642 } 1978 1
1643
1644} 1979}
1645 1980
1646############################################################################# 1981#############################################################################
1647 1982
1648package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1657 1992
1658sub new { 1993sub new {
1659 my $class = shift; 1994 my $class = shift;
1660 1995
1661 $class->SUPER::new ( 1996 $class->SUPER::new (
1662 padding => 4, 1997 padding_x => 4,
1998 padding_y => 4,
1663 fg => [1, 1, 1], 1999 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 2000 active_fg => [0, 0, 1],
1666 can_hover => 1, 2001 can_hover => 1,
1667 align => 0, 2002 align => 0,
1668 valign => 0, 2003 valign => 0,
1669 can_events => 1, 2004 can_events => 1,
1670 @_ 2005 @_
1671 ) 2006 )
1672} 2007}
1673 2008
1674sub button_up { 2009sub invoke_button_up {
1675 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1676 2011
2012 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 2014 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate"); 2015
1680 } 2016 1
1681} 2017}
1682 2018
1683sub _draw { 2019sub _draw {
1684 my ($self) = @_; 2020 my ($self) = @_;
1685 2021
1686 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1687
1688 if ($GRAB == $self) {
1689 $self->{fg} = $self->{active_fg};
1690 }
1691 2023
1692 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1694 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1695 2027
… …
1700 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
1701} 2033}
1702 2034
1703############################################################################# 2035#############################################################################
1704 2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
2069}
2070
2071#############################################################################
2072
1705package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
1706 2074
1707our @ISA = CFClient::UI::DrawBG::; 2075our @ISA = CFClient::UI::DrawBG::;
1708 2076
1709my @tex = 2077my @tex =
… …
1714 2082
1715sub new { 2083sub new {
1716 my $class = shift; 2084 my $class = shift;
1717 2085
1718 $class->SUPER::new ( 2086 $class->SUPER::new (
1719 padding => 2, 2087 padding_x => 2,
2088 padding_y => 2,
1720 fg => [1, 1, 1], 2089 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 2090 active_fg => [1, 1, 0],
2091 bg => [0, 0, 0, 0.2],
2092 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 2093 state => 0,
1723 can_hover => 1, 2094 can_hover => 1,
1724 @_ 2095 @_
1725 ) 2096 )
1726} 2097}
1727 2098
1728sub size_request { 2099sub size_request {
1729 my ($self) = @_; 2100 my ($self) = @_;
1730 2101
1731 ($self->{padding} * 2 + 6) x 2 2102 (6) x 2
1732} 2103}
1733 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1734sub button_down { 2113sub invoke_button_down {
1735 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1736 2115
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1739 $self->{state} = !$self->{state}; 2118 $self->toggle;
1740 $self->emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1741 } 2123 1
1742} 2124}
1743 2125
1744sub _draw { 2126sub _draw {
1745 my ($self) = @_; 2127 my ($self) = @_;
1746 2128
1747 $self->SUPER::_draw; 2129 $self->SUPER::_draw;
1748 2130
1749 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1750 2132
1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2133 my ($w, $h) = @$self{qw(w h)};
2134
2135 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1752 2136
1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1754 2138
1755 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756 2140
… …
1764package CFClient::UI::Image; 2148package CFClient::UI::Image;
1765 2149
1766our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1767 2151
1768use CFClient::OpenGL; 2152use CFClient::OpenGL;
1769use Carp qw/confess/;
1770 2153
1771our %loaded_images; 2154our %texture_cache;
1772 2155
1773sub new { 2156sub new {
1774 my $class = shift; 2157 my $class = shift;
1775 2158
1776 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1777 2163
1778 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
1779 2166
1780 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1781 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1782 2169
1783 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1784 2171
1785 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1786
1787 $self->{aspect} = $tex->{w} / $tex->{h};
1788 2173
1789 $self 2174 $self
1790} 2175}
1791 2176
1792sub size_request { 2177sub size_request {
1793 my ($self) = @_; 2178 my ($self) = @_;
1794 2179
1795 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1796} 2181}
1797 2182
1798sub _draw { 2183sub _draw {
1799 my ($self) = @_; 2184 my ($self) = @_;
1800 2185
… …
1909 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
1910 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
1911 2296
1912 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
1913 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1914 2302
1915 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
1916 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1917 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1919 2308
1920 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
1921 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
1936 2325
1937 if ($t3) { 2326 if ($t3) {
1938 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
1939 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
1940 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1941 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1942 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1943 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1944 glEnd; 2333 glEnd;
1945 } 2334 }
1946 2335
1947 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2018 # TODO: req_w/h are wrong with vertical 2407 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2408 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2409 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2410 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2411 active_fg => [0, 0, 0],
2412 bg => [0, 0, 0, 0.2],
2413 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2414 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2415 min_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2416 min_h => $::WIDTH / 80,
2026 vertical => 0, 2417 vertical => 0,
2027 can_hover => 1, 2418 can_hover => 1,
2028 inner_pad => .05, 2419 inner_pad => 0.02,
2029 @_ 2420 @_
2030 ); 2421 );
2031 2422
2032 $self->set_value ($self->{range}[0]); 2423 $self->set_value ($self->{range}[0]);
2033 $self->update; 2424 $self->update;
2034 2425
2035 $self 2426 $self
2036} 2427}
2037 2428
2429sub set_range {
2430 my ($self, $range) = @_;
2431
2432 ($range, $self->{range}) = ($self->{range}, $range);
2433
2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2438}
2439
2038sub set_value { 2440sub set_value {
2039 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2040 2442
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2443 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2444
2043 $hi = $lo + 1 if $hi <= $lo; 2445 $hi = $lo + 1 if $hi <= $lo;
2044 2446
2447 $page = $hi - $lo if $page > $hi - $lo;
2448
2045 $value = $lo if $value < $lo; 2449 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2450 $value = $hi - $page if $value > $hi - $page;
2047 2451
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2452 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2453 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052 2454
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2456
2055 if ($value != $old_value) { 2457 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2458 $self->emit (changed => $value);
… …
2059} 2461}
2060 2462
2061sub size_request { 2463sub size_request {
2062 my ($self) = @_; 2464 my ($self) = @_;
2063 2465
2064 my $w = $self->{req_w}; 2466 ($self->{req_w}, $self->{req_h})
2065 my $h = $self->{req_h};
2066
2067 $self->{vertical} ? ($h, $w) : ($w, $h)
2068} 2467}
2069 2468
2070sub button_down { 2469sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2072 2471
2073 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2473
2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2475
2074 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2075} 2477}
2076 2478
2077sub mouse_motion { 2479sub invoke_mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2079 2481
2080 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2484
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2485 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2486
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2487 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2488
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2489 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2490 } else {
2491 return 0;
2492 }
2493
2088 } 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2089} 2505}
2090 2506
2091sub update { 2507sub update {
2092 my ($self) = @_; 2508 my ($self) = @_;
2093 2509
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2510 delete $self->{knob_w};
2511 $self->SUPER::update;
2512}
2513
2514sub _draw {
2515 my ($self) = @_;
2516
2517 unless ($self->{knob_w}) {
2095 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2096 2519
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2521 my $range = ($hi - $page - $lo) || 1e-100;
2098 2522
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2523 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2524
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2525 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2526 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2527
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2528 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2529 $value = $value * $self->{scale} + $self->{offset};
2105 2530
2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2532 $self->{knob_w} = $knob_w;
2113 }); 2533 }
2114
2115 $self->SUPER::update;
2116}
2117
2118sub _draw {
2119 my ($self) = @_;
2120 2534
2121 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2122 2536
2123 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2124 2538
2125 if ($self->{vertical}) { 2539 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2540 # draw a vertical slider like a rotated horizontal slider
2127 2541
2542 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2543 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2544 }
2131 2545
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2546 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2547 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2548
… …
2144 glDisable GL_TEXTURE_2D; 2558 glDisable GL_TEXTURE_2D;
2145} 2559}
2146 2560
2147############################################################################# 2561#############################################################################
2148 2562
2563package CFClient::UI::ValSlider;
2564
2565our @ISA = CFClient::UI::HBox::;
2566
2567sub new {
2568 my ($class, %arg) = @_;
2569
2570 my $range = delete $arg{range};
2571
2572 my $self = $class->SUPER::new (
2573 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2574 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2575 to_value => sub { shift },
2576 from_value => sub { shift },
2577 %arg,
2578 );
2579
2580 $self->{slider}->connect (changed => sub {
2581 my ($self, $value) = @_;
2582 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2583 $self->{parent}->emit (changed => $value);
2584 });
2585
2586# $self->{entry}->connect (changed => sub {
2587# my ($self, $value) = @_;
2588# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2589# $self->{parent}->emit (changed => $value);
2590# });
2591
2592 $self->add ($self->{slider}, $self->{entry});
2593
2594 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2595
2596 $self
2597}
2598
2599sub set_range { shift->{slider}->set_range (@_) }
2600sub set_value { shift->{slider}->set_value (@_) }
2601
2602#############################################################################
2603
2149package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2150 2605
2151our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2152 2607
2153use CFClient::OpenGL; 2608use CFClient::OpenGL;
2154 2609
2155sub new { 2610sub new {
2156 my $class = shift; 2611 my $class = shift;
2157 2612
2158 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2159 fontsize => 1, 2614 fontsize => 1,
2160 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2161 #font => default_font 2617 #font => default_font
2162 @_, 2618 @_,
2163 2619
2164 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2165 par => [], 2621 par => [],
2166 height => 0, 2622 height => 0,
2167 children => [ 2623 children => [
2168 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2169 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2180 2636
2181 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2638 $self->reflow;
2183} 2639}
2184 2640
2185sub text_height { 2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2650sub invoke_size_allocate {
2651 my ($self, $w, $h) = @_;
2652
2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2655
2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2660
2661 $self->reflow;
2662
2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2186 my ($self, $text) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2187 2679
2188 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2189 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w}); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2192 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2193 2693 );
2194 ($layout->size)[1] 2694
2695 $layout
2195} 2696}
2196 2697
2197sub reflow { 2698sub reflow {
2198 my ($self) = @_; 2699 my ($self) = @_;
2199 2700
2200 $self->{need_reflow}++; 2701 $self->{need_reflow}++;
2201 $self->update; 2702 $self->update;
2202} 2703}
2203 2704
2204sub size_allocate { 2705sub set_offset {
2706 my ($self, $offset) = @_;
2707
2708 # todo: base offset on lines or so, not on pixels
2709 $self->{children}[1]->set_value ($offset);
2710}
2711
2712sub clear {
2205 my ($self, $w, $h) = @_; 2713 my ($self) = @_;
2206 2714
2207 $self->SUPER::size_allocate ($w, $h); 2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2208 2717
2209 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2718 $self->{par} = [];
2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2719 $self->{height} = 0;
2211 $self->{layout}->set_width ($self->{children}[0]{w}); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2212
2213 $self->reflow;
2214} 2721}
2215 2722
2216sub add_paragraph { 2723sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2218 2725
2219 #TODO: intelligently "reformat" paragraph 2726 my ($text, @w) = ref $para ? @$para : $para;
2220 2727
2221 my $height = $self->text_height ($text); 2728 $para = {
2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2735 };
2222 2736
2223 $self->{height} += $height; 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2224 2739
2225 push @{$self->{par}}, [$height, $color, $text]; 2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2226 2743
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2744sub scroll_to_bottom {
2228 $self->{children}[1]->update; 2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2229} 2749}
2230 2750
2231sub update { 2751sub update {
2232 my ($self) = @_; 2752 my ($self) = @_;
2233 2753
… …
2235 2755
2236 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2237 2757
2238 delete $self->{texture}; 2758 delete $self->{texture};
2239 2759
2240 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762
2241 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2242 my $height = 0; 2764 my $height = 0;
2243 2765
2244 $height += $_->[0] = $self->text_height ($_->[2])
2245 for @{$self->{par}}; 2766 for my $para (@{$self->{par}}) {
2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768 my $layout = $self->get_layout ($para);
2769 my ($w, $h) = $layout->size;
2770
2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2774 }
2775
2776 $height += $para->{h};
2777 }
2246 2778
2247 $self->{height} = $height; 2779 $self->{height} = $height;
2248 2780
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2250 2782
2251 delete $self->{texture}; 2783 delete $self->{texture};
2252 } 2784 }
2253 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2257 2793
2258 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2262 2795
2263 my $y0 = $top; 2796 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2797 my $y1 = $top + $H;
2265 2798
2266 my $y = 0; 2799 my $y = 0;
2267 2800
2268 my $layout = $self->{layout};
2269
2270 $layout->set_font ($self->{font}) if $self->{font};
2271
2272 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2273 my $h = $par->[0]; 2802 my $h = $para->{h};
2274 2803
2275 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
2277 $layout->set_markup ($par->[2]);
2278 2805
2279 my ($W, $H) = $layout->size; 2806 my $layout = $self->get_layout ($para);
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2807
2808 $layout->render ($para->{indent}, $y - $y0);
2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2281 } 2822 }
2282 2823
2283 $y += $h; 2824 $y += $h;
2284 } 2825 }
2285
2286 glDisable GL_TEXTURE_2D;
2287 }; 2826 };
2288 }); 2827 });
2289} 2828}
2290 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2291sub _draw { 2839sub _draw {
2292 my ($self) = @_; 2840 my ($self) = @_;
2293 2841
2294 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2299 2847
2300 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2301
2302} 2849}
2303 2850
2304############################################################################# 2851#############################################################################
2305 2852
2306package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2351 2898
2352sub new { 2899sub new {
2353 my $class = shift; 2900 my $class = shift;
2354 2901
2355 my $self = $class->SUPER::new ( 2902 my $self = $class->SUPER::new (
2356 state => 0, 2903 state => 0,
2357 connect_activate => \&toggle_flopper, 2904 on_activate => \&toggle_flopper,
2358 @_ 2905 @_
2359 ); 2906 );
2360 2907
2361 if ($self->{state}) {
2362 $self->{state} = 0;
2363 $self->toggle_flopper;
2364 }
2365
2366 $self 2908 $self
2367} 2909}
2368 2910
2369sub toggle_flopper { 2911sub toggle_flopper {
2370 my ($self) = @_; 2912 my ($self) = @_;
2371 2913
2372 # TODO: use animation 2914 $self->{other}->toggle_visibility;
2373 if ($self->{state} = !$self->{state}) {
2374 $CFClient::UI::ROOT->add ($self->{other});
2375 $self->{other}->move ($self->coord2global (0, $self->{h}));
2376 $self->emit ("open");
2377 } else {
2378 $CFClient::UI::ROOT->remove ($self->{other});
2379 $self->emit ("close");
2380 }
2381
2382 $self->emit (changed => $self->{state});
2383} 2915}
2384 2916
2385############################################################################# 2917#############################################################################
2386 2918
2387package CFClient::UI::Tooltip; 2919package CFClient::UI::Tooltip;
… …
2400} 2932}
2401 2933
2402sub set_tooltip_from { 2934sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2935 my ($self, $widget) = @_;
2404 2936
2937 my $tooltip = $widget->{tooltip};
2938
2939 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2942 . "req $widget->{req_w} $widget->{req_h}\n"
2943 . "visible $widget->{visible}";
2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2948
2405 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2950 markup => $tooltip,
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2952 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2953 fg => [0, 0, 0, 1],
2954 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2955 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2956 );
2412} 2957}
2413 2958
2414sub size_request { 2959sub size_request {
2415 my ($self) = @_; 2960 my ($self) = @_;
… …
2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2418 2963
2419 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2420} 2965}
2421 2966
2422sub size_allocate { 2967sub invoke_size_allocate {
2423 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2424 2969
2425 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2971}
2972
2973sub invoke_visibility_change {
2974 my ($self, $visible) = @_;
2975
2976 return unless $visible;
2977
2978 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner}
2980 or return;
2981
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w};
2986
2987 $self->move_abs ($x, $y);
2988 });
2426} 2989}
2427 2990
2428sub _draw { 2991sub _draw {
2429 my ($self) = @_; 2992 my ($self) = @_;
2430 2993
… …
2447 glVertex $w, $h; 3010 glVertex $w, $h;
2448 glVertex $w, 0; 3011 glVertex $w, 0;
2449 glEnd; 3012 glEnd;
2450 3013
2451 glTranslate 2 - 0.375, 2 - 0.375; 3014 glTranslate 2 - 0.375, 2 - 0.375;
3015
2452 $self->SUPER::_draw; 3016 $self->SUPER::_draw;
2453} 3017}
2454 3018
2455############################################################################# 3019#############################################################################
2456 3020
… …
2461use CFClient::OpenGL; 3025use CFClient::OpenGL;
2462 3026
2463sub new { 3027sub new {
2464 my $class = shift; 3028 my $class = shift;
2465 3029
2466 $class->SUPER::new ( 3030 my $self = $class->SUPER::new (
2467 aspect => 1, 3031 aspect => 1,
3032 can_events => 0,
2468 @_, 3033 @_,
2469 ) 3034 );
3035
3036 if ($self->{anim} && $self->{animspeed}) {
3037 Scalar::Util::weaken (my $widget = $self);
3038
3039 $self->{timer} = Event->timer (
3040 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041 hard => 1,
3042 interval => $self->{animspeed},
3043 cb => sub {
3044 ++$widget->{frame};
3045 $widget->update;
3046 },
3047 );
3048 }
3049
3050 $self
2470} 3051}
2471 3052
2472sub size_request { 3053sub size_request {
2473 (32, 8) 3054 (32, 8)
2474} 3055}
2475 3056
3057sub update {
3058 my ($self) = @_;
3059
3060 return unless $self->{visible};
3061
3062 $self->SUPER::update;
3063}
3064
2476sub _draw { 3065sub _draw {
2477 my ($self) = @_; 3066 my ($self) = @_;
2478 3067
2479 return unless $::CONN;#d# manage and cache textures differently 3068 return unless $::CONN;
3069
3070 my $face;
3071
3072 if ($self->{frame}) {
3073 my $anim = $::CONN->{anim}[$self->{anim}];
3074
3075 $face = $anim->[ $self->{frame} % @$anim ]
3076 if $anim && @$anim;
3077 }
3078
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 3080
2482 # TODO animation
2483 if ($tex) { 3081 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2489 } 3087 }
2490} 3088}
2491 3089
3090sub destroy {
3091 my ($self) = @_;
3092
3093 $self->{timer}->cancel
3094 if $self->{timer};
3095
3096 $self->SUPER::destroy;
3097}
3098
2492############################################################################# 3099#############################################################################
2493 3100
2494package CFClient::UI::InventoryItem; 3101package CFClient::UI::Buttonbar;
2495 3102
2496our @ISA = CFClient::UI::HBox::; 3103our @ISA = CFClient::UI::HBox::;
2497 3104
2498sub new { 3105# TODO: should actualyl wrap buttons and other goodies.
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509
2510 my $self = $class->SUPER::new (
2511 can_hover => 1,
2512 can_events => 1,
2513 tooltip => (CFClient::UI::Label->escape ($desc)
2514 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2515 connect_button_down => sub {
2516 my ($self, $ev, $x, $y) = @_;
2517
2518 # todo: maybe put examine on 1? but should just be a tooltip :(
2519 if ($ev->{button} == 1) {
2520 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2521 } elsif ($ev->{button} == 2) {
2522 $::CONN->send ("apply $item->{tag}");
2523 } elsif ($ev->{button} == 3) {
2524 CFClient::UI::Menu->new (
2525 items => [
2526 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2527 [
2528 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2529 sub { $::CONN->send ("lock $item->{tag}") },
2530 ],
2531 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2532 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2533 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2534 ],
2535 )->popup ($ev);
2536 }
2537
2538 1
2539 },
2540 %args
2541 );
2542
2543 $self->add (new CFClient::UI::Face
2544 can_events => 0,
2545 face => $item->{face},
2546 anim => $item->{anim},
2547 animspeed => $item->{animspeed},
2548 );
2549
2550 $self->add (new CFClient::UI::Label
2551 can_events => 0,
2552 text => $desc,
2553 );
2554
2555 $self
2556}
2557
2558#############################################################################
2559
2560package CFClient::UI::Inventory;
2561
2562our @ISA = CFClient::UI::ScrolledWindow::;
2563
2564sub new {
2565 my $class = shift;
2566
2567 my $self = $class->SUPER::new (
2568 scrolled => (new CFClient::UI::VBox),
2569 @_,
2570 );
2571
2572 $self
2573}
2574
2575sub set_items {
2576 my ($self, $items) = @_;
2577
2578 $self->{scrolled}->clear;
2579 return unless $items;
2580
2581 my @items = sort {
2582 ($a->{type} <=> $b->{type})
2583 or ($a->{name} cmp $b->{name})
2584 } @$items;
2585
2586 $self->{real_items} = \@items;
2587
2588 for my $item (@items) {
2589 my $desc = $item->{nrof} < 2
2590 ? $item->{name}
2591 : "$item->{nrof} $item->{name_pl}";
2592
2593 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2594 }
2595
2596 $self->{scrolled}->add (@items);
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604}
2605 3106
2606############################################################################# 3107#############################################################################
2607 3108
2608package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2609 3110
… …
2621 ); 3122 );
2622 3123
2623 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2624 3125
2625 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2626 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2627 3128
2628 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2629 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2630 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2631 can_hover => 1, 3146 can_hover => 1,
2632 can_events => 1, 3147 can_events => 1,
2633 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2634 } 3151 }
2635 3152
2636 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2637 3154
2638 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2650 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 3168 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2653 3170
2654 $self->show; 3171 $self->show;
2655 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2656} 3173}
2657 3174
2658sub mouse_motion { 3175sub invoke_mouse_motion {
2659 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2660 3177
2661 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2662 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2663 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2664}
2665 3181
3182 0
3183}
3184
2666sub button_up { 3185sub invoke_button_up {
2667 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2668 3187
2669 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 3189 undef $GRAB;
2671 $self->hide; 3190 $self->hide;
2672 3191
2673 $self->emit ("popdown"); 3192 $self->emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2675 } 3198 1
2676} 3199}
2677 3200
2678############################################################################# 3201#############################################################################
2679 3202
3203package CFClient::UI::Multiplexer;
3204
3205our @ISA = CFClient::UI::Container::;
3206
3207sub new {
3208 my $class = shift;
3209
3210 my $self = $class->SUPER::new (
3211 @_,
3212 );
3213
3214 $self->{current} = $self->{children}[0]
3215 if @{ $self->{children} };
3216
3217 $self
3218}
3219
3220sub add {
3221 my ($self, @widgets) = @_;
3222
3223 $self->SUPER::add (@widgets);
3224
3225 $self->{current} = $self->{children}[0]
3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3235sub set_current_page {
3236 my ($self, $page_or_widget) = @_;
3237
3238 my $widget = ref $page_or_widget
3239 ? $page_or_widget
3240 : $self->{children}[$page_or_widget];
3241
3242 $self->{current} = $widget;
3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3244
3245 $self->emit (page_changed => $self->{current});
3246
3247 $self->realloc;
3248}
3249
3250sub visible_children {
3251 $_[0]{current}
3252}
3253
3254sub size_request {
3255 my ($self) = @_;
3256
3257 $self->{current}->size_request
3258}
3259
3260sub invoke_size_allocate {
3261 my ($self, $w, $h) = @_;
3262
3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3266}
3267
3268sub _draw {
3269 my ($self) = @_;
3270
3271 $self->{current}->draw;
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Notebook;
3277
3278our @ISA = CFClient::UI::VBox::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self
3287 @_,
3288 );
3289
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3292
3293 $self
3294}
3295
3296sub add {
3297 my ($self, $title, $widget, $tooltip) = @_;
3298
3299 Scalar::Util::weaken $self;
3300
3301 $self->{buttonbar}->add (new CFClient::UI::Button
3302 markup => $title,
3303 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) },
3305 );
3306
3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3316sub set_current_page {
3317 my ($self, $page) = @_;
3318
3319 $self->{multiplexer}->set_current_page ($page);
3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3377}
3378
3379#############################################################################
3380
2680package CFClient::UI::Statusbox; 3381package CFClient::UI::Statusbox;
2681 3382
2682our @ISA = CFClient::UI::VBox::; 3383our @ISA = CFClient::UI::VBox::;
2683 3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
3389 fontsize => 0.8,
3390 @_,
3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
3398}
3399
2684sub reorder { 3400sub reorder {
2685 my ($self) = @_; 3401 my ($self) = @_;
2686 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
2687 3408
2688 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2689 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2690 } 3411 }
2691 3412
… …
2694 my @items = sort { 3415 my @items = sort {
2695 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2696 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2697 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2698 3419
3420 $self->{timer}->interval (1);
3421
2699 my $count = 10 + 1; 3422 my $count = 10 + 1;
2700 for my $item (@items) { 3423 for my $item (@items) {
2701 last unless --$count; 3424 last unless --$count;
2702 3425
2703 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2704 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2705 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2706 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2707 : $item->{text}; 3430 : $item->{text};
2708 3431
2709 for ($short) { 3432 for ($short) {
2710 s/^\s+//; 3433 s/^\s+//;
2711 s/\s+/ /g; 3434 s/\s+/ /g;
2712 my $len = int 40 / $item->{fontsize};
2713 substr $_, $len, length, "…" if $len < length;
2714 } 3435 }
2715 3436
2716 new CFClient::UI::Label 3437 new CFClient::UI::Label
2717 markup => $short, 3438 markup => $short,
2718 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2719 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2720 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2721 fontsize => $item->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
3443 max_w => $::WIDTH * 0.44,
2722 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
2723 can_events => 1, 3445 can_events => 1,
2724 can_hover => 1 3446 can_hover => 1
2725 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
2726 } 3460 }
2727 3461
2728 $self->clear; 3462 $self->clear;
2729 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2730} 3464}
… …
2733 my ($self, $text, %arg) = @_; 3467 my ($self, $text, %arg) = @_;
2734 3468
2735 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2736 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2737 3471
3472 return unless $text;
3473
2738 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2739 3475
2740 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2741 3477
2742 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2743 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2744 $item->{count}++; 3480 $item->{count}++;
2745 } else { 3481 } else {
2746 $item->{count} = 1; 3482 $item->{count} = 1;
2747 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2748 } 3484 }
2749 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2750 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2751 delete $item->{label}; 3487 delete $item->{label};
2752 } else { 3488 } else {
2753 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2754 id => ++$self->{id}, 3490 id => ++$self->{id},
2755 text => $text, 3491 text => $text,
2756 timeout => $timeout, 3492 timeout => $timeout,
2757 tooltip => $text, 3493 tooltip => $text,
2758 fontsize => 0.8,
2759 fg => [0.8, 0.8, 0.8, 0.8], 3494 fg => [0.8, 0.8, 0.8, 0.8],
2760 pri => 0, 3495 pri => 0,
2761 count => 1, 3496 count => 1,
2762 %arg, 3497 %arg,
2763 }; 3498 };
2764 } 3499 }
2765 3500
3501 $ROOT->on_refresh (reorder => sub {
3502 $self->reorder;
3503 });
3504}
3505
3506sub reconfigure {
3507 my ($self) = @_;
3508
3509 delete $_->{label}
3510 for values %{ $self->{item} || {} };
3511
2766 $self->reorder; 3512 $self->reorder;
3513 $self->SUPER::reconfigure;
3514}
3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
2767} 3522}
2768 3523
2769############################################################################# 3524#############################################################################
2770 3525
2771package CFClient::UI::Root; 3526package CFClient::UI::Inventory;
2772 3527
2773our @ISA = CFClient::UI::Container::; 3528our @ISA = CFClient::UI::Table::;
2774
2775use CFClient::OpenGL;
2776 3529
2777sub new { 3530sub new {
2778 my $class = shift; 3531 my $class = shift;
2779 3532
2780 $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
2781 @_, 3578 @_,
2782 ) 3579 )
2783} 3580}
2784 3581
2785sub configure { 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2786 my ($self, $x, $y, $w, $h) = @_;
2787 3583
2788 $self->{w} = $w; 3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2789 $self->{h} = $h; 3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2790} 3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2791 3594
2792sub check_size { 3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
2793 my ($self) = @_; 3668 my ($self, $spell) = @_;
2794 3669
2795 $self->size_allocate ($self->{w}, $self->{h}) 3670 $self->{spell}->{$spell->{name}} = $spell;
2796 if $self->{w}; 3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
3690package CFClient::UI::Root;
3691
3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3695
3696use CFClient::OpenGL;
3697
3698sub new {
3699 my $class = shift;
3700
3701 my $self = $class->SUPER::new (
3702 visible => 1,
3703 @_,
3704 );
3705
3706 Scalar::Util::weaken ($self->{root} = $self);
3707
3708 $self
2797} 3709}
2798 3710
2799sub size_request { 3711sub size_request {
2800 my ($self) = @_; 3712 my ($self) = @_;
2801 3713
2802 ($self->{w}, $self->{h}) 3714 ($self->{w}, $self->{h})
2803} 3715}
2804 3716
3717sub _to_pixel {
3718 my ($coord, $size, $max) = @_;
3719
3720 $coord =
3721 $coord eq "center" ? ($max - $size) * 0.5
3722 : $coord eq "max" ? $max
3723 : $coord;
3724
3725 $coord = 0 if $coord < 0;
3726 $coord = $max - $size if $coord > $max - $size;
3727
3728 int $coord + 0.5
3729}
3730
2805sub size_allocate { 3731sub invoke_size_allocate {
2806 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
2807
2808 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2809 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2810
2811 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2812 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2813 3733
2814 for my $child ($self->children) { 3734 for my $child ($self->children) {
2815 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2816 3736
2817 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3737 $X = $child->{force_x} if exists $child->{force_x};
2818 if exists $child->{req_x}; 3738 $Y = $child->{force_y} if exists $child->{force_y};
2819 3739
2820 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3740 $X = _to_pixel $X, $W, $self->{w};
2821 if exists $child->{req_y}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
2822
2823 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2824 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2825 3742
2826 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
2827 } 3744 }
3745
3746 1
2828} 3747}
2829 3748
2830sub coord2local { 3749sub coord2local {
2831 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
2832 3751
… …
2840} 3759}
2841 3760
2842sub update { 3761sub update {
2843 my ($self) = @_; 3762 my ($self) = @_;
2844 3763
2845 $self->check_size;
2846 $::WANT_REFRESH++; 3764 $::WANT_REFRESH++;
2847} 3765}
2848 3766
2849sub add { 3767sub add {
2850 my ($self, @children) = @_; 3768 my ($self, @children) = @_;
2851 3769
2852 for my $child (@children) {
2853 $child->{toplevel} = 1; 3770 $_->{is_toplevel} = 1
2854 3771 for @children;
2855 # integerise window positions
2856 $child->{x} = int $child->{x};
2857 $child->{y} = int $child->{y};
2858 }
2859 3772
2860 $self->SUPER::add (@children); 3773 $self->SUPER::add (@children);
3774}
3775
3776sub remove {
3777 my ($self, @children) = @_;
3778
3779 $self->SUPER::remove (@children);
3780
3781 delete $self->{is_toplevel}
3782 for @children;
3783
3784 while (@children) {
3785 my $w = pop @children;
3786 push @children, $w->children;
3787 $w->set_invisible;
3788 }
2861} 3789}
2862 3790
2863sub on_refresh { 3791sub on_refresh {
2864 my ($self, $id, $cb) = @_; 3792 my ($self, $id, $cb) = @_;
2865 3793
… …
2878 while ($self->{refresh_hook}) { 3806 while ($self->{refresh_hook}) {
2879 $_->() 3807 $_->()
2880 for values %{delete $self->{refresh_hook}}; 3808 for values %{delete $self->{refresh_hook}};
2881 } 3809 }
2882 3810
2883 if ($self->{check_size}) { 3811 if ($self->{realloc}) {
2884 my @queue = ([], []); 3812 my %queue;
3813 my @queue;
3814 my $widget;
2885 3815
2886 for (;;) { 3816 outer:
2887 if ($self->{check_size}) { 3817 while () {
2888 # heuristic: check containers last 3818 if (my $realloc = delete $self->{realloc}) {
2889 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3819 for $widget (values %$realloc) {
2890 for values %{delete $self->{check_size}} 3820 $widget->{visible} or next; # do not resize invisible widgets
3821
3822 $queue{$widget+0}++ and next; # duplicates are common
3823
3824 push @{ $queue[$widget->{visible}] }, $widget;
3825 }
2891 } 3826 }
2892 3827
2893 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3828 while () {
3829 @queue or last outer;
2894 3830
2895 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3831 $widget = pop @{ $queue[-1] || [] }
2896 ? @$widget{qw(user_w user_h)} 3832 and last;
2897 : $widget->size_request;
2898
2899 if (delete $widget->{force_alloc}
2900 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2901 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2902 3833
3834 pop @queue;
3835 }
3836
3837 delete $queue{$widget+0};
3838
3839 my ($w, $h) = $widget->size_request;
3840
3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3846
3847 $w = $widget->{force_w} if exists $widget->{force_w};
3848 $h = $widget->{force_h} if exists $widget->{force_h};
3849
3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3851 || delete $widget->{force_realloc}) {
2903 $widget->{req_w} = $w; 3852 $widget->{req_w} = $w;
2904 $widget->{req_h} = $h; 3853 $widget->{req_h} = $h;
2905 3854
2906 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3855 $self->{size_alloc}{$widget+0} = $widget;
2907 3856
2908 $widget->{parent}->check_size
2909 if $widget->{parent}; 3857 if (my $parent = $widget->{parent}) {
3858 $self->{realloc}{$parent+0} = $parent
3859 unless $queue{$parent+0};
3860
3861 $parent->{force_size_alloc} = 1;
3862 $self->{size_alloc}{$parent+0} = $parent;
3863 }
2910 } 3864 }
3865
3866 delete $self->{realloc}{$widget+0};
2911 } 3867 }
2912 } 3868 }
2913 3869
2914 while ($self->{size_alloc}) { 3870 while (my $size_alloc = delete $self->{size_alloc}) {
2915 for (values %{delete $self->{size_alloc}}) { 3871 my @queue = sort { $b->{visible} <=> $a->{visible} }
2916 my ($widget, $w, $h) = @$_; 3872 values %$size_alloc;
3873
3874 while () {
3875 my $widget = pop @queue || last;
3876
3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2917 3878
2918 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
2919 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
2920 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3888 $w = int $w + 0.5;
3889 $h = int $h + 0.5;
3890
3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3892 $widget->{old_w} = $widget->{w};
3893 $widget->{old_h} = $widget->{h};
3894
2921 $widget->{w} = $w; 3895 $widget->{w} = $w;
2922 $widget->{h} = $h; 3896 $widget->{h} = $h;
2923 $widget->size_allocate ($w, $h); 3897
2924 $widget->emit (size_allocate => $w, $h); 3898 $widget->emit (size_allocate => $w, $h);
3899 }
2925 } 3900 }
2926 } 3901 }
2927 3902
2928 while ($self->{post_alloc_hook}) { 3903 while ($self->{post_alloc_hook}) {
2929 $_->() 3904 $_->()
2930 for values %{delete $self->{post_alloc_hook}}; 3905 for values %{delete $self->{post_alloc_hook}};
2931 } 3906 }
2932 3907
3908
2933 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2934 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2935 glClear GL_COLOR_BUFFER_BIT; 3911 glClear GL_COLOR_BUFFER_BIT;
2936 3912
2937 glMatrixMode GL_PROJECTION; 3913 glMatrixMode GL_PROJECTION;
2938 glLoadIdentity; 3914 glLoadIdentity;
2939 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2940 glMatrixMode GL_MODELVIEW; 3916 glMatrixMode GL_MODELVIEW;
2941 glLoadIdentity; 3917 glLoadIdentity;
2942 3918
3919 {
3920 package CFClient::UI::Base;
3921
3922 ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h});
3924 }
3925
2943 $self->_draw; 3926 $self->_draw;
2944} 3927}
2945 3928
2946############################################################################# 3929#############################################################################
2947 3930
2948package CFClient::UI; 3931package CFClient::UI;
2949 3932
2950$ROOT = new CFClient::UI::Root; 3933$ROOT = new CFClient::UI::Root;
2951$TOOLTIP = new CFClient::UI::Tooltip; 3934$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2952 3935
29531 39361
2954 3937

Diff Legend

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