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.56 by root, Mon Apr 10 22:16:34 2006 UTC vs.
Revision 1.76 by root, Tue Apr 11 21:24:09 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $TOPLEVEL;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
… …
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
65 65
66 $hover->update if $hover; 66 $hover->update if $hover;
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER;
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
72 80
73sub new { 81sub new {
74 my $class = shift; 82 my $class = shift;
75 83
76 bless { @_ }, $class 84 bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class
77} 92}
78 93
79sub move { 94sub move {
80 my ($self, $x, $y, $z) = @_; 95 my ($self, $x, $y, $z) = @_;
81 $self->{x} = $x; 96 $self->{x} = $x;
… …
90sub size_request { 105sub size_request {
91 require Carp; 106 require Carp;
92 Carp::confess "size_request is abtract"; 107 Carp::confess "size_request is abtract";
93} 108}
94 109
95sub size_allocate { 110sub _size_allocate {
96 my ($self, $w, $h) = @_; 111 my ($self, $x, $y, $w, $h) = @_;
112
113 $self->{x} = $x;
114 $self->{y} = $y;
115
116 return unless $self->{w} != $w || $self->{h} != $h;
97 117
98 $self->{w} = $w; 118 $self->{w} = $w;
99 $self->{h} = $h; 119 $self->{h} = $h;
120
121 1
122}
123
124sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_;
126
127 $self->_size_allocate ($x, $y, $w, $h);
128}
129
130# translate global koordinates to local coordinate system
131sub translate {
132 my ($self, $x, $y) = @_;
133
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
100} 135}
101 136
102sub focus_in { 137sub focus_in {
103 my ($self) = @_; 138 my ($self) = @_;
139
140 return if $FOCUS == $self;
104 141
105 my $focus = $FOCUS; $FOCUS = $self; 142 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus; 143 $focus->update if $focus;
107 $FOCUS->update; 144 $FOCUS->update;
108} 145}
… …
116 $focus->update if $focus; #? 153 $focus->update if $focus; #?
117} 154}
118 155
119sub mouse_motion { } 156sub mouse_motion { }
120sub button_up { } 157sub button_up { }
121sub button_down { }
122sub key_down { } 158sub key_down { }
123sub key_up { } 159sub key_up { }
160
161sub button_down {
162 my ($self, $ev, $x, $y) = @_;
163
164 $self->focus_in;
165}
124 166
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 167sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 168sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 169sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 170sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 171sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 172
131sub draw { 173sub draw {
132 my ($self) = @_; 174 my ($self) = @_;
133 175
176 return unless $self->{h} && $self->{w};
177
134 glPushMatrix; 178 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 179 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 180 $self->_draw;
181 glPopMatrix;
182
137 if ($self == $HOVER) { 183 if ($self == $HOVER) {
138 glColor 1, 1, 1, 0.4; 184 my ($x, $y) = @$self{qw(x y)};
185
186 glColor 0, 0, 1, 0.2;
139 glEnable GL_BLEND; 187 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 189 glBegin GL_QUADS;
141 glVertex 0 , 0; 190 glVertex $x , $y;
142 glVertex $self->{w}, 0; 191 glVertex $x + $self->{w}, $y;
143 glVertex $self->{w}, $self->{h}; 192 glVertex $x + $self->{w}, $y + $self->{h};
144 glVertex 0 , $self->{h}; 193 glVertex $x , $y + $self->{h};
145 glEnd; 194 glEnd;
146 glDisable GL_BLEND; 195 glDisable GL_BLEND;
147 } 196 }
148 glPopMatrix;
149} 197}
150 198
151sub _draw { 199sub _draw {
152 my ($self) = @_; 200 my ($self) = @_;
153 201
… …
193 241
194 $self->{parent}->update 242 $self->{parent}->update
195 if $self->{parent}; 243 if $self->{parent};
196} 244}
197 245
246sub connect {
247 my ($self, $signal, $cb) = @_;
248
249 push @{ $self->{cb}{$signal} }, $cb;
250}
251
252sub emit {
253 my ($self, $signal, @args) = @_;
254
255 $_->($self, @args)
256 for @{$self->{cb}{$signal} || []};
257}
258
198sub DESTROY { 259sub DESTROY {
199 my ($self) = @_; 260 my ($self) = @_;
200 261
201 #$self->deactivate; 262 #$self->deactivate;
202} 263}
203 264
204############################################################################# 265#############################################################################
205 266
206package Crossfire::Client::Widget::Container; 267package CFClient::UI::DrawBG;
207 268
208our @ISA = Crossfire::Client::Widget::; 269our @ISA = CFClient::UI::Base::;
270
271use strict;
272use SDL::OpenGL;
209 273
210sub new { 274sub new {
275 my $class = shift;
276
277 # range [value, low, high, page]
278
279 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1],
282 @_
283 )
284}
285
286sub _draw {
287 my ($self) = @_;
288
289 my ($w, $h) = @$self{qw(w h)};
290
291 glEnable GL_BLEND;
292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
293 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
294
295 glBegin GL_QUADS;
296 glVertex 0 , 0;
297 glVertex 0 , $h;
298 glVertex $w, $h;
299 glVertex $w, 0;
300 glEnd;
301
302 glDisable GL_BLEND;
303}
304
305#############################################################################
306
307package CFClient::UI::Empty;
308
309our @ISA = CFClient::UI::Base::;
310
311sub size_request {
312 (0, 0)
313}
314
315sub draw { }
316
317#############################################################################
318
319package CFClient::UI::Container;
320
321our @ISA = CFClient::UI::Base::;
322
323sub new {
211 my ($class, @widgets) = @_; 324 my ($class, %arg) = @_;
212 325
326 my $children = delete $arg{children} || [];
327
213 my $self = $class->SUPER::new (children => []); 328 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 329 $self->add ($_) for @$children;
215 330
216 $self 331 $self
217} 332}
218 333
219sub add { 334sub add {
220 my ($self, $chld, $expand) = @_; 335 my ($self, $chld, $expand) = @_;
221 336
222 $chld->{expand} = $expand; 337 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 338 $chld->set_parent ($self);
224 339
225 @{$self->{children}} = 340 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 341 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 342 @{$self->{children}}, $chld
343 ];
228 344
229 $self->size_allocate ($self->{w}, $self->{h}) 345 $self->{w} = $self->{h} = -1;
230 if $self->{w}; #TODO: check for "realised state" 346 $self->update;
231} 347}
232 348
233sub remove { 349sub remove {
234 my ($self, $widget) = @_; 350 my ($self, $widget) = @_;
235 351
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 352 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237 353
238 $self->size_allocate ($self->{w}, $self->{h}); 354 $self->size_allocate (0, 0, $self->{w}, $self->{h});
239} 355}
240 356
241sub find_widget { 357sub find_widget {
242 my ($self, $x, $y) = @_; 358 my ($self, $x, $y) = @_;
243 359
… …
260 $_->draw for @{$self->{children}}; 376 $_->draw for @{$self->{children}};
261} 377}
262 378
263############################################################################# 379#############################################################################
264 380
265package Crossfire::Client::Widget::Bin; 381package CFClient::UI::Bin;
266 382
267our @ISA = Crossfire::Client::Widget::Container::; 383our @ISA = CFClient::UI::Container::;
384
385sub new {
386 my ($class, %arg) = @_;
387
388 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
389
390 $class->SUPER::new (children => [$child], %arg)
391}
392
393sub add {
394 my ($self, $widget) = @_;
395
396 $self->{children} = [];
397
398 $self->SUPER::add ($widget);
399}
400
401sub remove {
402 my ($self, $widget) = @_;
403
404 $self->SUPER::remove ($widget);
405
406 $self->{children} = [new CFClient::UI::Empty]
407 unless @{$self->{children}};
408}
268 409
269sub child { $_[0]->{children}[0] } 410sub child { $_[0]->{children}[0] }
270 411
271sub size_request { 412sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 413 $_[0]{children}[0]->size_request
273} 414}
274 415
275sub size_allocate { 416sub size_allocate {
276 my ($self, $w, $h) = @_; 417 my ($self, $x, $y, $w, $h) = @_;
277 418
278 $self->SUPER::size_allocate ($w, $h); 419 $self->_size_allocate ($x, $y, $w, $h) or return;
420
279 $self->{children}[0]->size_allocate ($w, $h) 421 $self->{children}[0]->size_allocate (0, 0, $w, $h);
280 if $self->{children}[0]
281} 422}
282 423
283############################################################################# 424#############################################################################
284 425
285package Crossfire::Client::Widget::Window; 426package CFClient::UI::Window;
286 427
287our @ISA = Crossfire::Client::Widget::Bin::; 428our @ISA = CFClient::UI::Bin::;
288 429
289use SDL::OpenGL; 430use SDL::OpenGL;
290 431
291sub new { 432sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 433 my ($class, %arg) = @_;
293 434
294 my $self = $class->SUPER::new; 435 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 436}
298 437
299sub update { 438sub update {
300 my ($self) = @_; 439 my ($self) = @_;
301 440
441 # we want to do this delayed...
302 $self->render_chld; 442 $self->render_chld;
303 $self->SUPER::update; 443 $self->SUPER::update;
304} 444}
305 445
306sub render_chld { 446sub render_chld {
307 my ($self) = @_; 447 my ($self) = @_;
308 448
309 $self->{texture} = 449 $self->{texture} =
310 Crossfire::Client::Texture->new_from_opengl ( 450 CFClient::Texture->new_from_opengl (
311 $self->{w}, $self->{h}, sub { $self->child->draw } 451 $self->{w}, $self->{h}, sub { $self->child->draw }
312 ); 452 );
313} 453}
314 454
315sub size_allocate { 455sub size_allocate {
316 my ($self, $w, $h) = @_; 456 my ($self, $x, $y, $w, $h) = @_;
317 457
318 $self->{w} = $w; 458 $self->_size_allocate ($x, $y, $w, $h) or return;
319 $self->{h} = $h;
320 459
321 $self->child->size_allocate ($w, $h); 460 $self->child->size_allocate (0, 0, $w, $h);
322 461
323 $self->render_chld; 462 $self->render_chld;
324} 463}
325 464
326sub _draw { 465sub _draw {
… …
330 469
331 my $tex = $self->{texture} 470 my $tex = $self->{texture}
332 or return; 471 or return;
333 472
334 glEnable GL_BLEND; 473 glEnable GL_BLEND;
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 475 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 477
338 $tex->draw_quad (0, 0, $w, $h); 478 $tex->draw_quad (0, 0, $w, $h);
339 479
… …
341 glDisable GL_TEXTURE_2D; 481 glDisable GL_TEXTURE_2D;
342} 482}
343 483
344############################################################################# 484#############################################################################
345 485
346package Crossfire::Client::Widget::Frame; 486package CFClient::UI::Frame;
347 487
348our @ISA = Crossfire::Client::Widget::Bin::; 488our @ISA = CFClient::UI::Bin::;
349 489
350use SDL::OpenGL; 490use SDL::OpenGL;
351 491
352sub size_request { 492sub size_request {
353 my ($self) = @_; 493 my ($self) = @_;
… …
358 498
359 map { $_ + 4 } $chld->size_request; 499 map { $_ + 4 } $chld->size_request;
360} 500}
361 501
362sub size_allocate { 502sub size_allocate {
363 my ($self, $w, $h) = @_; 503 my ($self, $x, $y, $w, $h) = @_;
364 504
365 $self->{w} = $w; 505 $self->_size_allocate ($x, $y, $w, $h) or return;
366 $self->{h} = $h;
367 506
368 $self->child->size_allocate ($w - 4, $h - 4); 507 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
369 $self->child->move (2, 2);
370} 508}
371 509
372sub _draw { 510sub _draw {
373 my ($self) = @_; 511 my ($self) = @_;
374 512
… …
387 $chld->draw; 525 $chld->draw;
388} 526}
389 527
390############################################################################# 528#############################################################################
391 529
392package Crossfire::Client::Widget::FancyFrame; 530package CFClient::UI::FancyFrame;
393 531
394our @ISA = Crossfire::Client::Widget::Bin::; 532our @ISA = CFClient::UI::Bin::;
395 533
396use SDL::OpenGL; 534use SDL::OpenGL;
397 535
398my @tex = 536my @tex =
399 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 537 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
400 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 538 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
401 539
402sub size_request { 540sub size_request {
403 my ($self) = @_; 541 my ($self) = @_;
404 542
405 my ($w, $h) = $self->SUPER::size_request; 543 my ($w, $h) = $self->SUPER::size_request;
406 544
407 $h += $tex[1]->{height}; 545 $h += $tex[1]->{h};
408 $h += $tex[4]->{height}; 546 $h += $tex[4]->{h};
409 $w += $tex[2]->{width}; 547 $w += $tex[2]->{w};
410 $w += $tex[3]->{width}; 548 $w += $tex[3]->{w};
411 549
412 ($w, $h) 550 ($w, $h)
413} 551}
414 552
415sub size_allocate { 553sub size_allocate {
416 my ($self, $w, $h) = @_; 554 my ($self, $x, $y, $w, $h) = @_;
417 555
418 $self->SUPER::size_allocate ($w, $h); 556 $self->_size_allocate ($x, $y, $w, $h) or return;
419 557
420 $h -= $tex[1]->{height}; 558 $h -= $tex[1]->{h};
421 $h -= $tex[4]->{height}; 559 $h -= $tex[4]->{h};
422 $w -= $tex[2]->{width}; 560 $w -= $tex[2]->{w};
423 $w -= $tex[3]->{width}; 561 $w -= $tex[3]->{w};
424 562
425 $h = $h < 0 ? 0 : $h; 563 $h = $h < 0 ? 0 : $h;
426 $w = $w < 0 ? 0 : $w; 564 $w = $w < 0 ? 0 : $w;
427 565
428 $self->child->size_allocate ($w, $h); 566 my $child = $self->child;
429 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 567
568 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
430} 569}
431 570
432sub _draw { 571sub _draw {
433 my ($self) = @_; 572 my ($self) = @_;
434 573
435 my ($w, $h) = ($self->{w}, $self->{h}); 574 my ($w, $h) = ($self->{w}, $self->{h});
436 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 575 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
437 576
438 glEnable GL_BLEND; 577 glEnable GL_BLEND;
578 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
439 glEnable GL_TEXTURE_2D; 579 glEnable GL_TEXTURE_2D;
440 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
442 581
443 my $top = $tex[1]; 582 my $top = $tex[1];
444 $top->draw_quad (0, 0, $w, $top->{height}); 583 $top->draw_quad (0, 0, $w, $top->{h});
445 584
446 my $left = $tex[3]; 585 my $left = $tex[3];
447 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 586 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
448 587
449 my $right = $tex[2]; 588 my $right = $tex[2];
450 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 589 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
451 590
452 my $bottom = $tex[4]; 591 my $bottom = $tex[4];
453 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 592 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
454 593
455 my $bg = $tex[0]; 594 my $bg = $tex[0];
595
456 glBindTexture GL_TEXTURE_2D, $bg->{name}; 596 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 598 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 599 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460 600
461 my $rep_x = $cw / $bg->{width}; 601 my $rep_x = $cw / $bg->{w};
462 my $rep_y = $ch / $bg->{height}; 602 my $rep_y = $ch / $bg->{h};
463 603
464 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 604 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
465 605
606 glDisable GL_TEXTURE_2D;
466 glDisable GL_BLEND; 607 glDisable GL_BLEND;
467 glDisable GL_TEXTURE_2D;
468 608
469 $self->child->draw; 609 $self->child->draw;
470 610
471} 611}
472 612
473############################################################################# 613#############################################################################
474 614
475package Crossfire::Client::Widget::Table; 615package CFClient::UI::Table;
476 616
477our @ISA = Crossfire::Client::Widget::Bin::; 617our @ISA = CFClient::UI::Base::;
618
619use List::Util qw(max sum);
478 620
479use SDL::OpenGL; 621use SDL::OpenGL;
480 622
481sub add { 623sub add {
482 my ($self, $x, $y, $chld) = @_; 624 my ($self, $x, $y, $chld) = @_;
483 my $old_chld = $self->{children}[$y][$x];
484 625
485 $self->{children}[$y][$x] = $chld; 626 $self->{children}[$y][$x] = $chld;
486 $chld->set_parent ($self); 627 $chld->set_parent ($self);
628
629 $self->{w} = $self->{h} = -1;
487 $self->update; 630 $self->update;
488} 631}
489 632
490sub max_row_height { 633sub get_wh {
491 my ($self, $row) = @_; 634 my ($self) = @_;
492 635
493 my $hs = 0; 636 my (@w, @h);
494 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 637
638 for my $y (0 .. $#{$self->{children}}) {
495 my $c = $self->{children}->[$row]->[$xi]; 639 my $row = $self->{children}[$y]
496 if ($c) { 640 or next;
641
642 for my $x (0 .. $#$row) {
643 my $widget = $row->[$x]
644 or next;
497 my ($w, $h) = $c->size_request; 645 my ($w, $h) = $widget->size_request;
498 if ($hs < $h) { $hs = $h } 646
647 $w[$x] = max $w[$x], $w;
648 $h[$y] = max $h[$y], $h;
499 } 649 }
500 } 650 }
501 return $hs;
502}
503 651
504sub max_col_width { 652 (\@w, \@h)
653}
654
655sub size_request {
505 my ($self, $col) = @_; 656 my ($self) = @_;
506 657
658 my ($ws, $hs) = $self->get_wh;
659
660 (
661 (List::Util::sum @$ws),
662 (List::Util::sum @$hs),
663 )
664}
665
666sub size_allocate {
667 my ($self, $x, $y, $w, $h) = @_;
668
669 $self->_size_allocate ($x, $y, $w, $h) or return;
670
671 my ($ws, $hs) = $self->get_wh;
672
673 my $req_w = List::Util::sum @$ws;
674 my $req_h = List::Util::sum @$hs;
675
676 # linearly scale sizes
677 $_ *= $req_w / $w for @$ws;
678 $_ *= $req_h / $h for @$hs;
679
680 my $y;
681
682 for my $r (0 .. $#{$self->{children}}) {
683 my $row = $self->{children}[$r]
684 or next;
685
507 my $ws = 0; 686 my $x = 0;
508 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 687 my $row_h = $hs->[$r];
509 my $c = ($self->{children}->[$yi] || [])->[$col]; 688
510 if ($c) { 689 for my $c (0 .. $#$row) {
511 my ($w, $h) = $c->size_request; 690 my $widget = $row->[$c]
512 if ($ws < $w) { $ws = $w } 691 or next;
692
693 my $col_w = $ws->[$c];
694
695 $widget->size_allocate ($x, $y, $col_w, $row_h);
696
697 $x += $col_w;
513 } 698 }
699
700 $y += $row_h;
514 } 701 }
515 return $ws; 702
516} 703}
704
705sub find_widget {
706 my ($self, $x, $y) = @_;
707
708 $x -= $self->{x};
709 $y -= $self->{y};
710
711 my $res;
712
713 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
714 $res = $_->find_widget ($x, $y)
715 and return $res;
716 }
717
718 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 for (grep $_, @{$self->{children}}) {
725 $_->draw for grep $_, @$_;
726 }
727}
728
729#############################################################################
730
731package CFClient::UI::HBox;
732
733# TODO: wrap into common Box base class
734
735our @ISA = CFClient::UI::Container::;
517 736
518sub size_request { 737sub size_request {
519 my ($self) = @_; 738 my ($self) = @_;
520 739
740 my @alloc = map [$_->size_request], @{$self->{children}};
741
742 (
743 (List::Util::sum map $_->[0], @alloc),
744 (List::Util::max map $_->[1], @alloc),
745 )
746}
747
748sub size_allocate {
749 my ($self, $x, $y, $w, $h) = @_;
750
751 $self->_size_allocate ($x, $y, $w, $h) or return;
752
753 return unless $self->{w};
754
521 my ($hs, $ws) = (0, 0); 755 ($h, $w) = ($w, $h);
522 756
523 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 757 my $children = $self->{children};
524 $hs += $self->max_row_height ($yi);
525 }
526 758
527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 759 my @h = map +($_->size_request)[0], @$children;
528 my $wm = 0; 760
529 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 761 my $req_h = List::Util::sum @h;
530 $wm += $self->max_col_width ($xi) 762
763 if ($req_h > $h) {
764 # ah well, not enough space
765 $_ = $h[$_] * $h / $req_h for @h;
766 } else {
767 my @exp = grep $_->{expand}, @$children;
768 @exp = @$children unless @exp;
769
770 my %exp = map +($_ => 1), @exp;
771
772 for (0 .. $#$children) {
773 my $child = $children->[$_];
774
775 my $alloc_h = $h[$_];
776 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
777 $h[$_] = $alloc_h;
531 } 778 }
532 if ($ws < $wm) { $ws = $wm }
533 } 779 }
534
535 return ($ws, $hs);
536}
537
538sub _draw {
539 my ($self) = @_;
540 780
541 my $y = 0; 781 my $y = 0;
542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 782 for (0 .. $#$children) {
783 my $child = $children->[$_];
543 my $x = 0; 784 my $h = $h[$_];
785 $child->size_allocate ($y, 0, $h, $w);
544 786
545 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 787 $y += $h;
546
547 my $c = $self->{children}->[$yi]->[$xi];
548 if ($c) {
549 $c->move ($x, $y, 0); #TODO: Move to size_request
550 $c->draw if $c;
551 }
552
553 $x += $self->max_col_width ($xi);
554 }
555
556 $y += $self->max_row_height ($yi);
557 } 788 }
558} 789}
559 790
560############################################################################# 791#############################################################################
561 792
562package Crossfire::Client::Widget::VBox; 793package CFClient::UI::VBox;
563 794
795# TODO: wrap into common Box base class
796
564our @ISA = Crossfire::Client::Widget::Container::; 797our @ISA = CFClient::UI::Container::;
565
566use SDL::OpenGL;
567 798
568sub size_request { 799sub size_request {
569 my ($self) = @_; 800 my ($self) = @_;
570 801
571 my @alloc = map [$_->size_request], @{$self->{children}}; 802 my @alloc = map [$_->size_request], @{$self->{children}};
… …
575 (List::Util::sum map $_->[1], @alloc), 806 (List::Util::sum map $_->[1], @alloc),
576 ) 807 )
577} 808}
578 809
579sub size_allocate { 810sub size_allocate {
580 my ($self, $w, $h) = @_; 811 my ($self, $x, $y, $w, $h) = @_;
581 812
582 $self->w ($w); 813 $self->_size_allocate ($x, $y, $w, $h) or return;
583 $self->h ($h);
584 814
585 my $exp; 815 return unless $self->{h};
586 my @oth; 816
587 # find expand widget 817 my $children = $self->{children};
588 for (@{$self->{children}}) { 818
589 if ($_->{expand}) { 819 my @h = map +($_->size_request)[1], @$children;
590 $exp = $_; 820
591 last; 821 my $req_h = List::Util::sum @h;
822
823 if ($req_h > $h) {
824 # ah well, not enough space
825 $_ = $h[$_] * $h / $req_h for @h;
826 } else {
827 my @exp = grep $_->{expand}, @$children;
828 @exp = @$children unless @exp;
829
830 my %exp = map +($_ => 1), @exp;
831
832 for (0 .. $#$children) {
833 my $child = $children->[$_];
834
835 my $alloc_h = $h[$_];
836 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
837 $h[$_] = $alloc_h;
592 } 838 }
593 push @oth, $_;
594 }
595
596 my ($ow, $oh);
597
598 # get sizes of other widgets
599 for (@oth) {
600 my ($w, $h) = $_->size_request;
601 $oh += $h;
602 if ($ow < $w) { $ow = $w }
603 } 839 }
604 840
605 my $y = 0; 841 my $y = 0;
606 for (@{$self->{children}}) { 842 for (0 .. $#$children) {
607 $_->move (0, $y); 843 my $child = $children->[$_];
608 844 my $h = $h[$_];
609 if ($_ == $exp) {
610 $_->size_allocate ($w, $h - $oh);
611 $y += $h - $oh;
612 } else {
613 my ($cw, $h) = $_->size_request;
614 $_->size_allocate ($w, $h); 845 $child->size_allocate (0, $y, $w, $h);
846
615 $y += $h; 847 $y += $h;
616 }
617 } 848 }
618} 849}
619 850
620############################################################################# 851#############################################################################
621 852
622package Crossfire::Client::Widget::Label; 853package CFClient::UI::Label;
623 854
624our @ISA = Crossfire::Client::Widget::; 855our @ISA = CFClient::UI::Base::;
625 856
626use SDL::OpenGL; 857use SDL::OpenGL;
627 858
628sub new { 859sub new {
629 my ($class, $x, $y, $z, $height, $text) = @_; 860 my ($class, %arg) = @_;
630 861
862 my $self = $class->SUPER::new (
863 fg => [1, 1, 1],
631 $height ||= $::FONTSIZE; 864 height => $::FONTSIZE,
865 text => "",
866 align => -1,
867 padding => 2,
868 layout => new CFClient::Layout,
869 %arg
870 );
632 871
633 # TODO: color, and make height, xyz etc. optional
634 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
635
636 $self->set_text ($text); 872 $self->set_text ($self->{text});
637 873
638 $self 874 $self
875}
876
877sub escape_text {
878 local $_ = $_[1];
879
880 s/&/&amp;/g;
881 s/>/&gt;/g;
882 s/</&lt;/g;
883
884 $_[1]
639} 885}
640 886
641sub set_text { 887sub set_text {
642 my ($self, $text) = @_; 888 my ($self, $text) = @_;
643 889
644 $self->{text} = $text; 890 $self->{text} = $text;
645 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 891 $self->{layout}->set_markup ($text);
646 892
893 delete $self->{texture};
647 $self->update; 894 $self->update;
648} 895}
649 896
650sub get_text { 897sub get_text {
651 my ($self, $text) = @_; 898 my ($self, $text) = @_;
… …
654} 901}
655 902
656sub size_request { 903sub size_request {
657 my ($self) = @_; 904 my ($self) = @_;
658 905
659 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 906 $self->{layout}->set_width;
660 ( 907 $self->{layout}->set_height ($self->{height});
661 $self->{texture}{width}, 908 my ($w, $h) = $self->{layout}->size;
662 $self->{texture}{height},
663 )
664 } else {
665 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
666 909
667 ($w, $h)
668 } 910 (
911 $w + $self->{padding} * 2,
912 $h + $self->{padding} * 2,
913 )
914}
669 915
916sub size_allocate {
917 my ($self, $x, $y, $w, $h) = @_;
918
919 $self->_size_allocate ($x, $y, $w, $h) or return;
920
921 delete $self->{texture};
922}
923
924sub update {
925 my ($self) = @_;
926
927 delete $self->{texture};
928 $self->SUPER::update;
670} 929}
671 930
672sub _draw { 931sub _draw {
673 my ($self) = @_; 932 my ($self) = @_;
674 933
675 my $tex = $self->{texture}; 934 my $tex = $self->{texture} ||= do {
935 $self->{layout}->set_width ($self->{w});
936 new_from_layout CFClient::Texture $self->{layout}
937 };
676 938
677 glEnable GL_BLEND; 939 glEnable GL_BLEND;
940 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
678 glEnable GL_TEXTURE_2D; 941 glEnable GL_TEXTURE_2D;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 942 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
681 943
682 glColor 1, 0, 0, 1; # TODO color 944 glColor @{$self->{fg}};
683 945
946 my $x =
947 $self->{align} < 0 ? $self->{padding}
948 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949 : ($self->{w} - $tex->{w}) * 0.5;
950
684 $tex->draw_quad (0, 0); 951 $tex->draw_quad ($x, 0);
685 952
953 glDisable GL_TEXTURE_2D;
686 glDisable GL_BLEND; 954 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D;
688} 955}
689 956
690############################################################################# 957#############################################################################
691 958
692package Crossfire::Client::Widget::Entry; 959package CFClient::UI::Entry;
693 960
694our @ISA = Crossfire::Client::Widget::Label::; 961our @ISA = CFClient::UI::Label::;
695 962
696use SDL; 963use SDL;
697use SDL::OpenGL; 964use SDL::OpenGL;
698 965
966sub new {
967 my $class = shift;
968
969 $class->SUPER::new (
970 fg => [1, 1, 1],
971 bg => [0, 0, 0, 0.2],
972 active_bg => [1, 1, 1],
973 active_fg => [0, 0, 0],
974 @_
975 )
976}
977
978sub _set_text {
979 my ($self, $text) = @_;
980
981 $self->{last_activity} = $::NOW;
982
983 $self->{text} = $text;
984 $self->{layout}->set_width ($self->{w});
985
986 $text =~ s/./*/g if $self->{hidden};
987
988 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
989
990 $text = substr $text, 0, $self->{cursor};
991 utf8::encode $text;
992
993 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
994}
995
996sub size_request {
997 my ($self) = @_;
998
999 my ($w, $h) = $self->SUPER::size_request;
1000
1001 ($w + 1, $h) # add 1 for cursor
1002}
1003
1004sub size_allocate {
1005 my ($self, $x, $y, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($x, $y, $w, $h);
1008
1009 $self->_set_text ($self->{text});
1010}
1011
1012sub set_text {
1013 my ($self, $text) = @_;
1014
1015 $self->{cursor} = length $text;
1016 $self->_set_text ($text);
1017 $self->update;
1018}
1019
699sub key_down { 1020sub key_down {
700 my ($self, $ev) = @_; 1021 my ($self, $ev) = @_;
701 1022
702 my $mod = $ev->key_mod; 1023 my $mod = $ev->key_mod;
703 my $sym = $ev->key_sym; 1024 my $sym = $ev->key_sym;
… …
705 my $uni = $ev->key_unicode; 1026 my $uni = $ev->key_unicode;
706 1027
707 my $text = $self->get_text; 1028 my $text = $self->get_text;
708 1029
709 if ($sym == SDLK_BACKSPACE) { 1030 if ($sym == SDLK_BACKSPACE) {
710 substr $text, -1, 1, ''; 1031 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1032 } elsif ($sym == SDLK_DELETE) {
1033 substr $text, $self->{cursor}, 1, "";
1034 } elsif ($sym == SDLK_LEFT) {
1035 --$self->{cursor} if $self->{cursor};
1036 } elsif ($sym == SDLK_RIGHT) {
1037 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1038 } elsif ($sym == SDLK_HOME) {
1039 $self->{cursor} = 0;
1040 } elsif ($sym == SDLK_END) {
1041 $self->{cursor} = length $text;
711 } elsif ($uni) { 1042 } elsif ($uni) {
712 $text .= chr $uni; 1043 substr $text, $self->{cursor}++, 0, chr $uni;
713 print "$uni <$text>\n";#d#
714 } 1044 }
715 1045
716 $self->set_text ($text); 1046 $self->_set_text ($text);
1047 $self->update;
1048}
1049
1050sub focus_in {
1051 my ($self) = @_;
1052
1053 $self->{last_activity} = $::NOW;
1054
1055 $self->SUPER::focus_in;
717} 1056}
718 1057
719sub button_down { 1058sub button_down {
720 my ($self, $ev) = @_; 1059 my ($self, $ev, $x, $y) = @_;
721 1060
722 $self->focus_in; 1061 $self->SUPER::button_down ($ev, $x, $y);
1062
1063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1064
1065 # byte-index to char-index
1066 my $text = $self->{text};
1067 utf8::encode $text;
1068 $self->{cursor} = length substr $text, 0, $idx;
1069
1070 $self->_set_text ($self->{text});
1071 $self->update;
1072}
1073
1074sub mouse_motion {
1075 my ($self, $ev, $x, $y) = @_;
1076# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
723} 1077}
724 1078
725sub _draw { 1079sub _draw {
726 my ($self) = @_; 1080 my ($self) = @_;
727 1081
1082 local $self->{fg} = $self->{fg};
1083
728 if ($FOCUS == $self) { 1084 if ($FOCUS == $self) {
729 glColor 1, 1, 1; 1085 glColor @{$self->{active_bg}};
1086 $self->{fg} = $self->{active_fg};
730 } else { 1087 } else {
731 glColor 0.7, 0.7, 0.7; 1088 glColor @{$self->{bg}};
732 } 1089 }
733 1090
1091 glEnable GL_BLEND;
1092 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
734 glBegin GL_QUADS; 1093 glBegin GL_QUADS;
735 glVertex 0 , 0; 1094 glVertex 0 , 0;
736 glVertex 0 , $self->{h} - 1; 1095 glVertex 0 , $self->{h};
737 glVertex $self->{w} - 1, $self->{h} - 1; 1096 glVertex $self->{w}, $self->{h};
738 glVertex $self->{w} - 1, 0; 1097 glVertex $self->{w}, 0;
739 glEnd; 1098 glEnd;
1099 glDisable GL_BLEND;
740 1100
741 $self->SUPER::_draw; 1101 $self->SUPER::_draw;
742}
743 1102
744############################################################################# 1103 #TODO: force update every cursor change :(
1104 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1105 glColor @{$self->{fg}};
1106 glBegin GL_LINES;
1107 glVertex $self->{cur_x}, $self->{cur_y};
1108 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1109 glEnd;
1110 }
1111}
745 1112
1113#############################################################################
1114
1115package CFClient::UI::Slider;
1116
1117use strict;
1118
1119use SDL::OpenGL;
1120
1121our @ISA = CFClient::UI::DrawBG::;
1122
1123sub new {
1124 my $class = shift;
1125
1126 # range [value, low, high, page]
1127
1128 my $self = $class->SUPER::new (
1129 fg => [1, 1, 1],
1130 active_fg => [0, 0, 0],
1131 range => [0, 0, 100, 10],
1132 req_w => 40,
1133 req_h => 10,
1134 vertical => 0,
1135 @_
1136 );
1137
1138 $self
1139}
1140
1141sub size_request {
1142 my ($self) = @_;
1143
1144 my $w = $self->{req_w};
1145 my $h = $self->{req_h};
1146
1147 $self->{vertical} ? ($h, $w) : ($w, $h)
1148}
1149
1150sub button_down {
1151 my ($self, $ev, $x, $y) = @_;
1152
1153 $self->SUPER::button_down ($ev, $x, $y);
1154 $self->mouse_motion ($ev, $x, $y);
1155}
1156
1157sub mouse_motion {
1158 my ($self, $ev, $x, $y) = @_;
1159
1160 if ($GRAB == $self) {
1161 my ($value, $lo, $hi, $page) = @{$self->{range}};
1162
1163 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164
1165 $x = $x * ($hi - $lo) / $w + $lo;
1166 $x = $lo if $x < $lo;
1167 $x = $hi - $page if $x > $hi - $page;
1168 $self->{range}[0] = $x;
1169
1170 $self->emit (changed => $x);
1171 $self->update;
1172 }
1173}
1174
1175sub _draw {
1176 my ($self) = @_;
1177
1178 $self->SUPER::_draw ();
1179
1180 my ($w, $h) = @$self{qw(w h)};
1181
1182 if ($self->{vertical}) {
1183 # draw a vertical slider like a rotated horizontal slider
1184
1185 glRotate 90, 0, 0, 1;
1186 glTranslate 0, -$self->{w}, 0;
1187
1188 ($w, $h) = ($h, $w);
1189 }
1190
1191 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193
1194 my ($value, $lo, $hi, $page) = @{$self->{range}};
1195
1196 $page = int $page * $w / ($hi - $lo);
1197 $value = int +($value - $lo) * $w / ($hi - $lo);
1198
1199 $w -= $page;
1200 $page &= ~1;
1201 glTranslate $page * 0.5, 0, 0;
1202
1203 glColor @$fg;
1204 glBegin GL_LINES;
1205 glVertex 0, 0; glVertex 0, $h;
1206 glVertex $w - 1, 0; glVertex $w - 1, $h;
1207 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208 glEnd;
1209
1210 my $knob_a = $value - $page * 0.5;
1211 my $knob_b = $value + $page * 0.5;
1212
1213 glBegin GL_QUADS;
1214 glColor @$fg;
1215 glVertex $knob_a, 0;
1216 glVertex $knob_a, $h;
1217 glVertex $knob_b, $h;
1218 glVertex $knob_b, 0;
1219
1220 if ($knob_a < $knob_b - 2) {
1221 glColor @$bg;
1222 glVertex $knob_a + 1, 1;
1223 glVertex $knob_a + 1, $h - 1;
1224 glVertex $knob_b - 1, $h - 1;
1225 glVertex $knob_b - 1, 1;
1226 }
1227 glEnd;
1228}
1229
1230#############################################################################
1231
746package Crossfire::Client::Widget::MapWidget; 1232package CFClient::UI::MapWidget;
747 1233
748use strict; 1234use strict;
749 1235
750use List::Util qw(min max); 1236use List::Util qw(min max);
751 1237
752use SDL; 1238use SDL;
753use SDL::OpenGL; 1239use SDL::OpenGL;
754use SDL::OpenGL::Constants;
755 1240
756our @ISA = Crossfire::Client::Widget::; 1241our @ISA = CFClient::UI::Base::;
1242
1243sub new {
1244 my $class = shift;
1245
1246 $class->SUPER::new (
1247 z => -1,
1248 list => (glGenLists 1),
1249 @_
1250 )
1251}
757 1252
758sub key_down { 1253sub key_down {
759 print "MAPKEYDOWN\n"; 1254 print "MAPKEYDOWN\n";
760} 1255}
761 1256
… …
767 1 + int $::WIDTH / 32, 1262 1 + int $::WIDTH / 32,
768 1 + int $::HEIGHT / 32, 1263 1 + int $::HEIGHT / 32,
769 ) 1264 )
770} 1265}
771 1266
1267sub update {
1268 my ($self) = @_;
1269
1270 $self->{need_update} = 1;
1271 $self->SUPER::update;
1272}
1273
772sub _draw { 1274sub _draw {
773 my ($self) = @_; 1275 my ($self) = @_;
774 1276
1277 if (delete $self->{need_update}) {
1278 glNewList $self->{list}, GL_COMPILE;
1279
775 my $mx = $::CONN->{mapx}; 1280 my $mx = $::CONN->{mapx};
776 my $my = $::CONN->{mapy}; 1281 my $my = $::CONN->{mapy};
777 1282
778 my $map = $::CONN->{map}; 1283 my $map = $::CONN->{map};
779 1284
780 my ($xofs, $yofs); 1285 my ($xofs, $yofs);
781 1286
782 my $sw = 1 + int $::WIDTH / 32; 1287 my $sw = 1 + int $::WIDTH / 32;
783 my $sh = 1 + int $::HEIGHT / 32; 1288 my $sh = 1 + int $::HEIGHT / 32;
784 1289
785 if ($::CONN->{mapw} > $sw) { 1290 if ($::CONN->{mapw} > $sw) {
786 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1291 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
787 } else { 1292 } else {
788 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1293 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
789 } 1294 }
790 1295
791 if ($::CONN->{maph} > $sh) { 1296 if ($::CONN->{maph} > $sh) {
792 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1297 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
793 } else { 1298 } else {
794 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1299 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
795 } 1300 }
796 1301
797 glEnable GL_TEXTURE_2D; 1302 glEnable GL_TEXTURE_2D;
798 glEnable GL_BLEND; 1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
800 1306
801 my $sw4 = ($sw + 3) & ~3; 1307 my $sw4 = ($sw + 3) & ~3;
802 my $lighting = "\x00" x ($sw4 * $sh); 1308 my $darkness = "\x00" x ($sw4 * $sh);
803 1309
804 for my $x (0 .. $sw - 1) { 1310 for my $x (0 .. $sw - 1) {
1311 my $row = $map->[$x + $xofs];
805 for my $y (0 .. $sh - 1) { 1312 for my $y (0 .. $sh - 1) {
806 1313
807 my $cell = $map->[$x + $xofs][$y + $yofs] 1314 my $cell = $row->[$y + $yofs]
808 or next; 1315 or next;
809 1316
810 my $darkness = $cell->[0] * (1 / 255); 1317 my $dark = $cell->[0];
811 if ($darkness < 0) { 1318 if ($dark < 0) {
812 $darkness = $cell->[1] ? 0.1 : 0; 1319 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1320 } else {
1321 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
813 } 1322 }
814 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
815 1323
816 for my $num (grep $_, @$cell[1,2,3]) { 1324 for my $num (grep $_, @$cell[1,2,3]) {
817 my $tex = $::CONN->{face}[$num]{texture} || next; 1325 my $tex = $::CONN->{face}[$num]{texture} || next;
1326
1327 my ($w, $h) = @$tex{qw(w h)};
1328
1329 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
818 1330 }
819 my $w = $tex->{width};
820 my $h = $tex->{height};
821
822 my $px = ($x + 1) * 32 - $w;
823 my $py = ($y + 1) * 32 - $h;
824
825 $tex->draw_quad ($px, $py, $w, $h);
826 } 1331 }
827 } 1332 }
828 }
829 1333
830# if (1) { # higher quality darkness 1334# if (1) { # higher quality darkness
831# $lighting =~ s/(.)/$1$1$1/gs; 1335# $lighting =~ s/(.)/$1$1$1/gs;
832# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1336# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
833# 1337#
… …
835# 1339#
836# $lighting = $pb->get_pixels; 1340# $lighting = $pb->get_pixels;
837# $lighting =~ s/(.)../$1/gs; 1341# $lighting =~ s/(.)../$1/gs;
838# } 1342# }
839 1343
840 $lighting = new Crossfire::Client::Texture
841 width => $sw4,
842 height => $sh,
843 data => $lighting,
844 internalformat => GL_ALPHA,
845 format => GL_ALPHA;
846
847 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
848 glColor 0.45, 0.45, 0.45, 1;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1344 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
850 glBindTexture GL_TEXTURE_2D, $lighting->{name};
851 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
852 1345
1346 $darkness = new CFClient::Texture
1347 w => $sw4,
1348 h => $sh,
1349 data => $darkness,
1350 internalformat => GL_ALPHA,
1351 format => GL_ALPHA;
1352
1353 glColor 0.45, 0.45, 0.45, 1;
853 $lighting->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1354 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
854 1355
855 glDisable GL_TEXTURE_2D; 1356 glDisable GL_TEXTURE_2D;
856 glDisable GL_BLEND; 1357 glDisable GL_BLEND;
1358
1359 glEndList;
1360 }
1361
1362 glCallList $self->{list};
857} 1363}
858 1364
859my %DIR = ( 1365my %DIR = (
860 SDLK_KP8, [1, "north"], 1366 SDLK_KP8, [1, "north"],
861 SDLK_KP9, [2, "northeast"], 1367 SDLK_KP9, [2, "northeast"],
… …
907 } 1413 }
908} 1414}
909 1415
910############################################################################# 1416#############################################################################
911 1417
912package Crossfire::Client::Widget::Animator; 1418package CFClient::UI::Animator;
913 1419
914use SDL::OpenGL; 1420use SDL::OpenGL;
915 1421
916our @ISA = Crossfire::Client::Widget::Bin::; 1422our @ISA = CFClient::UI::Bin::;
917 1423
918sub moveto { 1424sub moveto {
919 my ($self, $x, $y) = @_; 1425 my ($self, $x, $y) = @_;
920 1426
921 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1427 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
926} 1432}
927 1433
928sub animate { 1434sub animate {
929 my ($self, $interval) = @_; 1435 my ($self, $interval) = @_;
930 1436
931 printf "%5.2f\n", 1 / $interval;#d#
932
933 $self->{time} -= $interval * $self->{speed}; 1437 $self->{time} -= $interval * $self->{speed};
934 if ($self->{time} <= 0) { 1438 if ($self->{time} <= 0) {
935 $self->{time} = 0; 1439 $self->{time} = 0;
936 ::animation_stop $self; 1440 ::animation_stop $self;
937 } 1441 }
… …
951 glPopMatrix; 1455 glPopMatrix;
952} 1456}
953 1457
954############################################################################# 1458#############################################################################
955 1459
956package Crossfire::Client::Widget::Toplevel; 1460package CFClient::UI::Toplevel;
957 1461
958our @ISA = Crossfire::Client::Widget::Container::; 1462our @ISA = CFClient::UI::Container::;
959 1463
960sub size_request { 1464sub size_request {
961 ($::WIDTH, $::HEIGHT) 1465 ($::WIDTH, $::HEIGHT)
962} 1466}
963 1467
964sub size_allocate { 1468sub size_allocate {
965 my ($self, $w, $h) = @_; 1469 my ($self, $x, $y, $w, $h) = @_;
966 1470
967 $self->SUPER::size_allocate ($w, $h); 1471 $self->_size_allocate ($x, $y, $w, $h);
968 1472
969 $_->size_allocate ($_->size_request) 1473 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
970 for @{$self->{children}}; 1474 for @{$self->{children}};
971} 1475}
972 1476
1477sub translate {
1478 my ($self, $x, $y) = @_;
1479
1480 ($x, $y)
1481}
1482
973sub update { 1483sub update {
974 my ($self) = @_; 1484 my ($self) = @_;
975 1485
976 $self->size_allocate ($self->size_request); 1486 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
977 ::refresh (); 1487 ::refresh ();
978} 1488}
979 1489
980sub add { 1490sub add {
981 my ($self, $widget) = @_; 1491 my ($self, $widget) = @_;
982 1492
983 $self->SUPER::add ($widget); 1493 $self->SUPER::add ($widget);
984 1494
985 $widget->size_allocate ($widget->size_request); 1495 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
986} 1496}
987 1497
988sub draw { 1498sub draw {
989 my ($self) = @_; 1499 my ($self) = @_;
990 1500
991 $self->_draw; 1501 $self->_draw;
992} 1502}
993 1503
994############################################################################# 1504#############################################################################
995 1505
996package Crossfire::Client::Widget; 1506package CFClient::UI;
997 1507
998$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1508$TOPLEVEL = new CFClient::UI::Toplevel;
999 1509
10001 15101
1001 1511

Diff Legend

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