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

Diff Legend

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