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.37 by root, Sun Apr 9 21:05:50 2006 UTC vs.
Revision 1.69 by root, Tue Apr 11 17:32:14 2006 UTC

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

Diff Legend

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