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

Diff Legend

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