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

Diff Legend

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