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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 2007 UTC

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

Diff Legend

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