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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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