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.183 by elmex, Sun Apr 30 13:10:46 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines