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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

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

Diff Legend

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