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

Diff Legend

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