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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 2007 UTC

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

Diff Legend

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