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

Diff Legend

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