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.36 by elmex, Sun Apr 9 17:39:56 2006 UTC vs.
Revision 1.58 by root, Tue Apr 11 12:21:29 2006 UTC

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 Crossfire::Client;
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 { @_ }, $class
37 Carp::confess "size_request is abtract"; 94 Carp::confess "size_request is abtract";
38} 95}
39 96
40sub size_allocate { 97sub size_allocate {
41 my ($self, $w, $h) = @_; 98 my ($self, $w, $h) = @_;
99
42 $self->w ($w); 100 $self->{w} = $w;
43 $self->h ($h); 101 $self->{h} = $h;
102}
103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 109}
45 110
46sub focus_in { 111sub focus_in {
47 my ($widget) = @_; 112 my ($self) = @_;
48 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
49} 117}
50 118
51sub focus_out { 119sub focus_out {
52 my ($widget) = @_; 120 my ($self) = @_;
53}
54 121
55sub key_down { 122 return unless $FOCUS == $self;
56 my ($widget, $sdlev) = @_;
57}
58 123
59sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
60 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
61} 126}
62 127
128sub mouse_motion { }
129sub button_up { }
63sub button_down { 130sub button_down { }
64 my ($widget, $sdlev) = @_; 131sub key_down { }
65} 132sub key_up { }
66 133
67sub button_up {
68 my ($widget, $sdlev) = @_;
69}
70
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 139
77sub draw { 140sub draw {
78 my ($self) = @_; 141 my ($self) = @_;
79 142
80 glPushMatrix; 143 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
83 glPopMatrix; 157 glPopMatrix;
84} 158}
85 159
86sub _draw { 160sub _draw {
87 my ($widget) = @_; 161 my ($self) = @_;
162
163 warn "no draw defined for $self\n";
88} 164}
89 165
90sub bbox { 166sub bbox {
91 my ($self) = @_; 167 my ($self) = @_;
92 my ($w, $h) = $self->size_request; 168 my ($w, $h) = $self->size_request;
96 $self->{x} = $w, 172 $self->{x} = $w,
97 $self->{y} = $h 173 $self->{y} = $h
98 ) 174 )
99} 175}
100 176
177sub find_widget {
178 my ($self, $x, $y) = @_;
179
180 return $self
181 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183
184 ()
185}
186
101sub del_parent { $_[0]->{parent} = undef } 187sub del_parent { $_[0]->{parent} = undef }
102 188
103sub set_parent { 189sub set_parent {
104 my ($self, $par) = @_; 190 my ($self, $par) = @_;
105 191
122 my ($self) = @_; 208 my ($self) = @_;
123 209
124 #$self->deactivate; 210 #$self->deactivate;
125} 211}
126 212
213#############################################################################
214
215package Crossfire::Client::Widget::Container;
216
217our @ISA = Crossfire::Client::Widget::;
218
219sub new {
220 my ($class, @widgets) = @_;
221
222 my $self = $class->SUPER::new (children => []);
223 $self->add ($_) for @widgets;
224
225 $self
226}
227
228sub add {
229 my ($self, $chld, $expand) = @_;
230
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self);
233
234 @{$self->{children}} =
235 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld;
237
238 $self->size_allocate ($self->{w}, $self->{h})
239 if $self->{w}; #TODO: check for "realised state"
240}
241
242sub remove {
243 my ($self, $widget) = @_;
244
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246
247 $self->size_allocate ($self->{w}, $self->{h});
248}
249
250sub find_widget {
251 my ($self, $x, $y) = @_;
252
253 $x -= $self->{x};
254 $y -= $self->{y};
255
256 my $res;
257
258 for (reverse @{ $self->{children} }) {
259 $res = $_->find_widget ($x, $y)
260 and return $res;
261 }
262
263 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
264}
265
266sub _draw {
267 my ($self) = @_;
268
269 $_->draw for @{$self->{children}};
270}
271
272#############################################################################
273
127package Crossfire::Client::Widget::Bin; 274package Crossfire::Client::Widget::Bin;
128 275
129our @ISA = Crossfire::Client::Widget::; 276our @ISA = Crossfire::Client::Widget::Container::;
130 277
131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] }
132sub get { $_[0]->{child} } 278sub child { $_[0]->{children}[0] }
133
134sub remove {
135 my ($self, $chld) = @_;
136 delete $self->{child}
137 if $self->{child} == $chld;
138}
139 279
140sub size_request { 280sub size_request {
141 $_[0]->{child}->size_request if $_[0]->{child} 281 $_[0]{children}[0]->size_request if $_[0]{children}[0];
142} 282}
283
143sub size_allocate { 284sub size_allocate {
144 my ($self, $w, $h) = @_; 285 my ($self, $w, $h) = @_;
286
145 $self->SUPER::size_allocate ($w, $h); 287 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h) 288 $self->{children}[0]->size_allocate ($w, $h)
147 if $self->{child} 289 if $self->{children}[0]
148} 290}
149 291
150sub _draw { 292#############################################################################
151 my ($self) = @_;
152 293
153 $self->{child}->draw;
154}
155
156package Crossfire::Client::Widget::Toplevel; 294package Crossfire::Client::Widget::Window;
157 295
158our @ISA = Crossfire::Client::Widget::; 296our @ISA = Crossfire::Client::Widget::Bin::;
159 297
160use SDL::OpenGL; 298use SDL::OpenGL;
161 299
162sub add { 300sub new {
163 my ($self, $chld) = @_; 301 my ($class, $x, $y, $z, $w, $h) = @_;
164 302
165 push @{$self->{childs}}, $chld; 303 my $self = $class->SUPER::new;
166 @{$self->{childs}} =
167 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}};
169 304
170 $chld->set_parent ($self); 305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
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} 306}
181 307
182sub update { 308sub update {
183 my ($self) = @_; 309 my ($self) = @_;
184 ::refresh ();
185}
186 310
187sub _draw {
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; 311 $self->render_chld;
312 $self->SUPER::update;
215} 313}
216 314
217sub render_chld { 315sub render_chld {
218 my ($self) = @_; 316 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 317
222 require Carp;
223 Carp::cluck "RENDERCHI $w $h";
224 warn "RENDERCHI $w $h\n";
225 $self->{texture} = 318 $self->{texture} =
226 Crossfire::Client::Texture->new_from_opengl ( 319 Crossfire::Client::Texture->new_from_opengl (
227 $w, $h, sub { $chld->draw } 320 $self->{w}, $self->{h}, sub { $self->child->draw }
228 ); 321 );
229 $self->{texture}->upload;
230}
231
232sub size_request {
233 my ($self) = @_;
234 ($self->w, $self->h)
235} 322}
236 323
237sub size_allocate { 324sub size_allocate {
238 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
239 326
240 $self->w ($w); 327 $self->{w} = $w;
241 $self->h ($h); 328 $self->{h} = $h;
329
242 $self->get->size_allocate ($w, $h); 330 $self->child->size_allocate ($w, $h);
243 331
244 $self->update; #TODO: Move this to the size_request event propably? 332 $self->render_chld;
245} 333}
246 334
247sub _draw { 335sub _draw {
248 my ($self) = @_; 336 my ($self) = @_;
249 337
253 or return; 341 or return;
254 342
255 glEnable GL_BLEND; 343 glEnable GL_BLEND;
256 glEnable GL_TEXTURE_2D; 344 glEnable GL_TEXTURE_2D;
257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
258 glBindTexture GL_TEXTURE_2D, $tex->{name};
259 346
260 glBegin GL_QUADS; 347 $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 348
267 glDisable GL_BLEND; 349 glDisable GL_BLEND;
268 glDisable GL_TEXTURE_2D; 350 glDisable GL_TEXTURE_2D;
269} 351}
270 352
353#############################################################################
354
271package Crossfire::Client::Widget::Frame; 355package Crossfire::Client::Widget::Frame;
272 356
273our @ISA = Crossfire::Client::Widget::Bin::; 357our @ISA = Crossfire::Client::Widget::Bin::;
274 358
275use SDL::OpenGL; 359use SDL::OpenGL;
276 360
277sub size_request { 361sub size_request {
278 my ($self) = @_; 362 my ($self) = @_;
279 my $chld = $self->get 363 my $chld = $self->child
280 or return (0, 0); 364 or return (0, 0);
281 365
282 $chld->move (2, 2); 366 $chld->move (2, 2);
283 367
284 map { $_ + 4 } $chld->size_request; 368 map { $_ + 4 } $chld->size_request;
285} 369}
286 370
287sub size_allocate { 371sub size_allocate {
288 my ($self, $w, $h) = @_; 372 my ($self, $w, $h) = @_;
289 373
290 $self->w ($w); 374 $self->{w} = $w;
291 $self->h ($h); 375 $self->{h} = $h;
292 376
293 $self->get->size_allocate ($w - 4, $h - 4); 377 $self->child->size_allocate ($w - 4, $h - 4);
294 $self->get->move (2, 2); 378 $self->child->move (2, 2);
295} 379}
296 380
297sub _draw { 381sub _draw {
298 my ($self) = @_; 382 my ($self) = @_;
299 383
300 my $chld = $self->get; 384 my $chld = $self->child;
301 385
302 my ($w, $h) = $chld->size_request; 386 my ($w, $h) = $chld->size_request;
303 387
304 glBegin GL_QUADS; 388 glBegin GL_QUADS;
305 glColor 0, 0, 0; 389 glColor 0, 0, 0;
306 glTexCoord 0, 0; glVertex 0 , 0; 390 glVertex 0 , 0;
307 glTexCoord 0, 1; glVertex 0 , $h + 4; 391 glVertex 0 , $h + 4;
308 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 392 glVertex $w + 4 , $h + 4;
309 glTexCoord 1, 0; glVertex $w + 4 , 0; 393 glVertex $w + 4 , 0;
310 glEnd; 394 glEnd;
311 395
312 $chld->draw; 396 $chld->draw;
313} 397}
314 398
399#############################################################################
400
315package Crossfire::Client::Widget::FancyFrame; 401package Crossfire::Client::Widget::FancyFrame;
316 402
317our @ISA = Crossfire::Client::Widget::Frame::; 403our @ISA = Crossfire::Client::Widget::Bin::;
318 404
319use SDL::OpenGL; 405use SDL::OpenGL;
320 406
321sub new { 407my @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 $_ } 408 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 409 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 410
332sub size_request { 411sub size_request {
333 my ($self) = @_; 412 my ($self) = @_;
413
334 my ($w, $h) = $self->get->size_request; 414 my ($w, $h) = $self->SUPER::size_request;
335 415
336 $h += $self->{txts}->[1]->{height}; 416 $h += $tex[1]->{height};
337 $h += $self->{txts}->[4]->{height}; 417 $h += $tex[4]->{height};
338 $w += $self->{txts}->[2]->{width}; 418 $w += $tex[2]->{width};
339 $w += $self->{txts}->[3]->{width}; 419 $w += $tex[3]->{width};
340 420
341 ($w, $h) 421 ($w, $h)
342} 422}
343 423
344sub size_allocate { 424sub size_allocate {
345 my ($self, $w, $h) = @_; 425 my ($self, $w, $h) = @_;
346 426
347 $self->w ($w); 427 $self->SUPER::size_allocate ($w, $h);
348 $self->h ($h); 428
349 $h -= $self->{txts}->[1]->{height}; 429 $h -= $tex[1]->{height};
350 $h -= $self->{txts}->[4]->{height}; 430 $h -= $tex[4]->{height};
351 $w -= $self->{txts}->[2]->{width}; 431 $w -= $tex[2]->{width};
352 $w -= $self->{txts}->[3]->{width}; 432 $w -= $tex[3]->{width};
353 433
354 $h = $h < 0 ? 0 : $h; 434 $h = $h < 0 ? 0 : $h;
355 $w = $w < 0 ? 0 : $w; 435 $w = $w < 0 ? 0 : $w;
356 warn "CHILD:$w $h\n"; 436
357 $self->get->size_allocate ($w, $h); 437 $self->child->size_allocate ($w, $h);
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 438 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
359} 439}
360 440
361sub _draw { 441sub _draw {
362 my ($self) = @_; 442 my ($self) = @_;
363 443
364 my ($w, $h) = ($self->w, $self->h); 444 my ($w, $h) = ($self->{w}, $self->{h});
365 my ($cw, $ch) = ($self->get->w, $self->get->h); 445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
366 446
367 glEnable GL_BLEND; 447 glEnable GL_BLEND;
368 glEnable GL_TEXTURE_2D; 448 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371 451
372 my $top = $self->{txts}->[1]; 452 my $top = $tex[1];
373 glBindTexture GL_TEXTURE_2D, $top->{name}; 453 $top->draw_quad (0, 0, $w, $top->{height});
374 454
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]; 455 my $left = $tex[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name}; 456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
384 457
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]; 458 my $right = $tex[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name}; 459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
394 460
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]; 461 my $bottom = $tex[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
404 463
405 glBegin GL_QUADS; 464 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}; 465 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417 469
418 my $rep_x = $cw / $bg->{width}; 470 my $rep_x = $cw / $bg->{width};
419 my $rep_y = $ch / $bg->{height}; 471 my $rep_y = $ch / $bg->{height};
420 472
421 glBegin GL_QUADS; 473 $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 474
428 glDisable GL_BLEND; 475 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
430 477
431 $self->get->draw; 478 $self->child->draw;
432 479
433} 480}
481
482#############################################################################
434 483
435package Crossfire::Client::Widget::Table; 484package Crossfire::Client::Widget::Table;
436 485
437our @ISA = Crossfire::Client::Widget::Bin::; 486our @ISA = Crossfire::Client::Widget::Bin::;
438 487
439use SDL::OpenGL; 488use SDL::OpenGL;
440 489
441sub add { 490sub add {
442 my ($self, $x, $y, $chld) = @_; 491 my ($self, $x, $y, $chld) = @_;
443 my $old_chld = $self->{childs}[$y][$x]; 492 my $old_chld = $self->{children}[$y][$x];
444 493
445 $self->{childs}[$y][$x] = $chld; 494 $self->{children}[$y][$x] = $chld;
446 $chld->set_parent ($self); 495 $chld->set_parent ($self);
447 $self->update; 496 $self->update;
448} 497}
449 498
450sub max_row_height { 499sub max_row_height {
451 my ($self, $row) = @_; 500 my ($self, $row) = @_;
452 501
453 my $hs = 0; 502 my $hs = 0;
454 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
455 my $c = $self->{childs}->[$row]->[$xi]; 504 my $c = $self->{children}->[$row]->[$xi];
456 if ($c) { 505 if ($c) {
457 my ($w, $h) = $c->size_request; 506 my ($w, $h) = $c->size_request;
458 if ($hs < $h) { $hs = $h } 507 if ($hs < $h) { $hs = $h }
459 } 508 }
460 } 509 }
463 512
464sub max_col_width { 513sub max_col_width {
465 my ($self, $col) = @_; 514 my ($self, $col) = @_;
466 515
467 my $ws = 0; 516 my $ws = 0;
468 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
469 my $c = ($self->{childs}->[$yi] || [])->[$col]; 518 my $c = ($self->{children}->[$yi] || [])->[$col];
470 if ($c) { 519 if ($c) {
471 my ($w, $h) = $c->size_request; 520 my ($w, $h) = $c->size_request;
472 if ($ws < $w) { $ws = $w } 521 if ($ws < $w) { $ws = $w }
473 } 522 }
474 } 523 }
478sub size_request { 527sub size_request {
479 my ($self) = @_; 528 my ($self) = @_;
480 529
481 my ($hs, $ws) = (0, 0); 530 my ($hs, $ws) = (0, 0);
482 531
483 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
484 $hs += $self->max_row_height ($yi); 533 $hs += $self->max_row_height ($yi);
485 } 534 }
486 535
487 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
488 my $wm = 0; 537 my $wm = 0;
489 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
490 $wm += $self->max_col_width ($xi) 539 $wm += $self->max_col_width ($xi)
491 } 540 }
492 if ($ws < $wm) { $ws = $wm } 541 if ($ws < $wm) { $ws = $wm }
493 } 542 }
494 543
497 546
498sub _draw { 547sub _draw {
499 my ($self) = @_; 548 my ($self) = @_;
500 549
501 my $y = 0; 550 my $y = 0;
502 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
503 my $x = 0; 552 my $x = 0;
504 553
505 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
506 555
507 my $c = $self->{childs}->[$yi]->[$xi]; 556 my $c = $self->{children}->[$yi]->[$xi];
508 if ($c) { 557 if ($c) {
509 $c->move ($x, $y, 0); #TODO: Move to size_request 558 $c->move ($x, $y, 0); #TODO: Move to size_request
510 $c->draw if $c; 559 $c->draw if $c;
511 } 560 }
512 561
515 564
516 $y += $self->max_row_height ($yi); 565 $y += $self->max_row_height ($yi);
517 } 566 }
518} 567}
519 568
569#############################################################################
570
520package Crossfire::Client::Widget::VBox; 571package Crossfire::Client::Widget::VBox;
521 572
522our @ISA = Crossfire::Client::Widget::Bin::; 573our @ISA = Crossfire::Client::Widget::Container::;
523 574
524use SDL::OpenGL; 575use SDL::OpenGL;
525 576
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 { 577sub size_request {
535 my ($self) = @_; 578 my ($self) = @_;
536 579
537 my ($hs, $ws) = (0, 0); 580 my @alloc = map [$_->size_request], @{$self->{children}};
538 for (@{$self->{childs} || []}) { 581
539 my ($w, $h) = $_->size_request;
540 $hs += $h;
541 if ($ws < $w) { $ws = $w }
542 } 582 (
543 583 (List::Util::max map $_->[0], @alloc),
544 return ($ws, $hs); 584 (List::Util::sum map $_->[1], @alloc),
585 )
545} 586}
546 587
547sub size_allocate { 588sub size_allocate {
548 my ($self, $w, $h) = @_; 589 my ($self, $w, $h) = @_;
549 590
551 $self->h ($h); 592 $self->h ($h);
552 593
553 my $exp; 594 my $exp;
554 my @oth; 595 my @oth;
555 # find expand widget 596 # find expand widget
556 for (@{$self->{childs}}) { 597 for (@{$self->{children}}) {
557 if ($_->{expand}) { 598 if ($_->{expand}) {
558 $exp = $_; 599 $exp = $_;
559 last; 600 last;
560 } 601 }
561 push @oth, $_; 602 push @oth, $_;
569 $oh += $h; 610 $oh += $h;
570 if ($ow < $w) { $ow = $w } 611 if ($ow < $w) { $ow = $w }
571 } 612 }
572 613
573 my $y = 0; 614 my $y = 0;
574 for (@{$self->{childs}}) { 615 for (@{$self->{children}}) {
575 $_->move (0, $y); 616 $_->move (0, $y);
576 617
577 if ($_ == $exp) { 618 if ($_ == $exp) {
578 $_->size_allocate ($w, $h - $oh); 619 $_->size_allocate ($w, $h - $oh);
579 $y += $h - $oh; 620 $y += $h - $oh;
583 $y += $h; 624 $y += $h;
584 } 625 }
585 } 626 }
586} 627}
587 628
588sub _draw { 629#############################################################################
589 my ($self) = @_;
590
591 my ($x, $y);
592 for (@{$self->{childs} || []}) {
593 $_->draw;
594 $y += $_->h;
595 }
596}
597 630
598package Crossfire::Client::Widget::Label; 631package Crossfire::Client::Widget::Label;
599 632
600our @ISA = Crossfire::Client::Widget::; 633our @ISA = Crossfire::Client::Widget::;
601 634
602use SDL::OpenGL; 635use SDL::OpenGL;
603 636
604sub new { 637sub new {
605 my ($class, $x, $y, $z, $height, $text) = @_; 638 my ($class, $x, $y, $z, $height, $text) = @_;
606 639
640 $height ||= $::FONTSIZE;
641
607 # TODO: color, and make height, xyz etc. optional 642 # TODO: color, and make height, xyz etc. optional
608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 643 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
609 644
610 $self->set_text ($text); 645 $self->set_text ($text);
611 646
628} 663}
629 664
630sub size_request { 665sub size_request {
631 my ($self) = @_; 666 my ($self) = @_;
632 667
633 ( 668 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
669 (
634 $self->{texture}{width}, 670 $self->{texture}{width},
635 $self->{texture}{height}, 671 $self->{texture}{height},
672 )
673 } else {
674 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
675
676 ($w, $h)
636 ) 677 }
678
637} 679}
638 680
639sub _draw { 681sub _draw {
640 my ($self) = @_; 682 my ($self) = @_;
641 683
643 685
644 glEnable GL_BLEND; 686 glEnable GL_BLEND;
645 glEnable GL_TEXTURE_2D; 687 glEnable GL_TEXTURE_2D;
646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 688 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
648 glBindTexture GL_TEXTURE_2D, $tex->{name};
649 690
650 glColor 1, 0, 0, 1; # TODO color 691 glColor 1, 0, 0, 1; # TODO color
651 692
652 glBegin GL_QUADS; 693 $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 694
659 glDisable GL_BLEND; 695 glDisable GL_BLEND;
660 glDisable GL_TEXTURE_2D; 696 glDisable GL_TEXTURE_2D;
661} 697}
662 698
699#############################################################################
700
663package Crossfire::Client::Widget::TextEntry; 701package Crossfire::Client::Widget::Entry;
664 702
665our @ISA = Crossfire::Client::Widget::Label::; 703our @ISA = Crossfire::Client::Widget::Label::;
666 704
667use SDL; 705use SDL;
668use SDL::OpenGL; 706use SDL::OpenGL;
671 my ($self, $ev) = @_; 709 my ($self, $ev) = @_;
672 710
673 my $mod = $ev->key_mod; 711 my $mod = $ev->key_mod;
674 my $sym = $ev->key_sym; 712 my $sym = $ev->key_sym;
675 713
676 $ev->set_unicode (1);
677 my $uni = $ev->key_unicode; 714 my $uni = $ev->key_unicode;
678 715
679 my $text = $self->get_text; 716 my $text = $self->get_text;
680 717
681 if ($sym == SDLK_BACKSPACE) { 718 if ($sym == SDLK_BACKSPACE) {
682 substr $text, -1, 1, ''; 719 substr $text, -1, 1, '';
683
684 } elsif ($uni) { 720 } elsif ($uni) {
685 $text .= chr $uni; 721 $text .= chr $uni;
686 } 722 }
723
687 $self->set_text ($text); 724 $self->set_text ($text);
688} 725}
726
727sub button_down {
728 my ($self, $ev) = @_;
729
730 $self->focus_in;
731}
732
733sub mouse_motion {
734 my ($self, $ev, $x, $y) = @_;
735 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
736}
737
738sub _draw {
739 my ($self) = @_;
740
741 if ($FOCUS == $self) {
742 glColor 1, 1, 1;
743 } else {
744 glColor 0.7, 0.7, 0.7;
745 }
746
747 glBegin GL_QUADS;
748 glVertex 0 , 0;
749 glVertex 0 , $self->{h} - 1;
750 glVertex $self->{w} - 1, $self->{h} - 1;
751 glVertex $self->{w} - 1, 0;
752 glEnd;
753
754 $self->SUPER::_draw;
755}
756
757#############################################################################
689 758
690package Crossfire::Client::Widget::MapWidget; 759package Crossfire::Client::Widget::MapWidget;
691 760
692use strict; 761use strict;
693 762
705 774
706sub key_up { 775sub key_up {
707} 776}
708 777
709sub size_request { 778sub size_request {
710 779 (
711} 780 1 + int $::WIDTH / 32,
712 781 1 + int $::HEIGHT / 32,
713sub size_allocate { 782 )
714} 783}
715 784
716sub _draw { 785sub _draw {
717 my ($self) = @_; 786 my ($self) = @_;
718 787
741 glEnable GL_TEXTURE_2D; 810 glEnable GL_TEXTURE_2D;
742 glEnable GL_BLEND; 811 glEnable GL_BLEND;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 813
745 my $sw4 = ($sw + 3) & ~3; 814 my $sw4 = ($sw + 3) & ~3;
746 my $lighting = "\x00" x ($sw4 * $sh); 815 my $darkness = "\x00" x ($sw4 * $sh);
747 816
748 for my $x (0 .. $sw - 1) { 817 for my $x (0 .. $sw - 1) {
818 my $row = $map->[$x + $xofs];
749 for my $y (0 .. $sh - 1) { 819 for my $y (0 .. $sh - 1) {
750 820
751 my $cell = $map->[$x + $xofs][$y + $yofs] 821 my $cell = $row->[$y + $yofs]
752 or next; 822 or next;
753 823
754 my $darkness = $cell->[0] * (1 / 255); 824 my $dark = $cell->[0];
755 if ($darkness < 0) { 825 if ($dark < 0) {
756 $darkness = 0.15; 826 substr $darkness, $y * $sw4 + $x, 1, chr 224;
827 } else {
828 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
757 } 829 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
759 830
760 for my $num (grep $_, @$cell[1,2,3]) { 831 for my $num (grep $_, @$cell[1,2,3]) {
761 my $tex = $::CONN->{face}[$num]{texture} || next; 832 my $tex = $::CONN->{face}[$num]{texture} || next;
762 833
763 glBindTexture GL_TEXTURE_2D, $tex->{name};
764
765 my $w = $tex->{width}; 834 my $w = $tex->{width};
766 my $h = $tex->{height}; 835 my $h = $tex->{height};
767 836
768 my $px = ($x + 1) * 32 - $w; 837 $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;
777 } 838 }
778 } 839 }
779 } 840 }
780 841
781# if (1) { # higher quality darkness 842# if (1) { # higher quality darkness
786# 847#
787# $lighting = $pb->get_pixels; 848# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs; 849# $lighting =~ s/(.)../$1/gs;
789# } 850# }
790 851
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
854
791 $lighting = new Crossfire::Client::Texture 855 $darkness = new Crossfire::Client::Texture
792 width => $sw4, 856 width => $sw4,
793 height => $sh, 857 height => $sh,
794 data => $lighting, 858 data => $darkness,
795 internalformat => GL_ALPHA4, 859 internalformat => GL_ALPHA,
796 format => GL_ALPHA; 860 format => GL_ALPHA;
797 861
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 862 glColor 0.45, 0.45, 0.45, 1;
799 glColor 0, 0, 0, 0.75; 863 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
800 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 864
810 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
811 glDisable GL_BLEND; 866 glDisable GL_BLEND;
812} 867}
813 868
860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 915 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
861 $::CONN->send ("command run_stop"); 916 $::CONN->send ("command run_stop");
862 } 917 }
863} 918}
864 919
920#############################################################################
921
865package Crossfire::Client::Widget::Animator; 922package Crossfire::Client::Widget::Animator;
866 923
867use SDL::OpenGL; 924use SDL::OpenGL;
868 925
869our @ISA = Crossfire::Client::Widget::Bin::; 926our @ISA = Crossfire::Client::Widget::Bin::;
870 927
871sub moveto { 928sub moveto {
872 my ($self, $x, $y) = @_; 929 my ($self, $x, $y) = @_;
873 930
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 931 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.01; 932 $self->{speed} = 0.001;
876 $self->{time} = 1; 933 $self->{time} = 1;
877 934
878 ::animation_start $self; 935 ::animation_start $self;
879} 936}
880 937
895 952
896sub _draw { 953sub _draw {
897 my ($self) = @_; 954 my ($self) = @_;
898 955
899 glPushMatrix; 956 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0; 957 glRotate $self->{time} * 1000, 0, 1, 0;
901 $self->{child}->draw; 958 $self->{children}[0]->draw;
902 glPopMatrix; 959 glPopMatrix;
903} 960}
904 961
9051; 962#############################################################################
906 963
964package Crossfire::Client::Widget::Toplevel;
965
966our @ISA = Crossfire::Client::Widget::Container::;
967
968sub size_request {
969 ($::WIDTH, $::HEIGHT)
970}
971
972sub size_allocate {
973 my ($self, $w, $h) = @_;
974
975 $self->SUPER::size_allocate ($w, $h);
976
977 $_->size_allocate ($_->size_request)
978 for @{$self->{children}};
979}
980
981sub translate {
982 my ($self, $x, $y) = @_;
983
984 ($x, $y)
985}
986
987sub update {
988 my ($self) = @_;
989
990 $self->size_allocate ($self->size_request);
991 ::refresh ();
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->SUPER::add ($widget);
998
999 $widget->size_allocate ($widget->size_request);
1000}
1001
1002sub draw {
1003 my ($self) = @_;
1004
1005 $self->_draw;
1006}
1007
1008#############################################################################
1009
1010package Crossfire::Client::Widget;
1011
1012$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
1013
10141
1015

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines