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

Diff Legend

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