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

Diff Legend

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