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.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.381 by root, Thu Jul 19 13:45:18 2007 UTC

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

Diff Legend

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