ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 UTC

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

Diff Legend

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